<toplevel>

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        * Makefile.def: Remove reference to boehm-gc target module.
        * configure.ac: Include pkg.m4, check for --with-target-bdw-gc
        options and for the bdw-gc pkg-config module.
        * configure: Regenerate.
        * Makefile.in: Regenerate.

gcc/

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        * doc/install.texi: Document configure options --enable-objc-gc
        and --with-target-bdw-gc.

config/

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        * pkg.m4: New file.

libobjc/

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (--enable-objc-gc): Allow to configure with a
        system provided boehm-gc.
        * configure: Regenerate.
        * Makefile.in (OBJC_BOEHM_GC_LIBS): Get value from configure.
        * gc.c: Include system bdw-gc headers.
        * memory.c: Likewise
        * objects.c: Likewise

boehm-gc/

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        Remove


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@242985 138bc75d-0d04-0410-961f-82ee72b054a4

176 files changed, 0 insertions, 83154 deletions

diff --git a/boehm-gc/AmigaOS.c b/boehm-gc/AmigaOS.c
deleted file mode 100644
index f4024a7978f..00000000000
--- a/boehm-gc/AmigaOS.c
+++ /dev/null
@@ -1,623 +0,0 @@
-
-
-/******************************************************************
-
-  AmigaOS-spesific routines for GC.
-  This file is normally included from os_dep.c
-
-******************************************************************/
-
-
-#if !defined(GC_AMIGA_DEF) && !defined(GC_AMIGA_SB) && !defined(GC_AMIGA_DS) && !defined(GC_AMIGA_AM)
-# include "gc_priv.h"
-# include <stdio.h>
-# include <signal.h>
-# define GC_AMIGA_DEF
-# define GC_AMIGA_SB
-# define GC_AMIGA_DS
-# define GC_AMIGA_AM
-#endif
-
-
-#ifdef GC_AMIGA_DEF
-
-# ifndef __GNUC__
-#   include <exec/exec.h>
-# endif
-# include <proto/exec.h>
-# include <proto/dos.h>
-# include <dos/dosextens.h>
-# include <workbench/startup.h>
-
-#endif
-
-
-
-
-#ifdef GC_AMIGA_SB
-
-/******************************************************************
-   Find the base of the stack.
-******************************************************************/
-
-ptr_t GC_get_stack_base()
-{
-    struct Process *proc = (struct Process*)SysBase->ThisTask;
- 
-    /* Reference: Amiga Guru Book Pages: 42,567,574 */
-    if (proc->pr_Task.tc_Node.ln_Type==NT_PROCESS
-        && proc->pr_CLI != NULL) {
-	/* first ULONG is StackSize */
-	/*longPtr = proc->pr_ReturnAddr;
-	size = longPtr[0];*/
-
-	return (char *)proc->pr_ReturnAddr + sizeof(ULONG);
-    } else {
-	return (char *)proc->pr_Task.tc_SPUpper;
-    }
-}
-
-#if 0 /* old version */
-ptr_t GC_get_stack_base()
-{
-    extern struct WBStartup *_WBenchMsg;
-    extern long __base;
-    extern long __stack;
-    struct Task *task;
-    struct Process *proc;
-    struct CommandLineInterface *cli;
-    long size;
-
-    if ((task = FindTask(0)) == 0) {
-	GC_err_puts("Cannot find own task structure\n");
-	ABORT("task missing");
-    }
-    proc = (struct Process *)task;
-    cli = BADDR(proc->pr_CLI);
-
-    if (_WBenchMsg != 0 || cli == 0) {
-	size = (char *)task->tc_SPUpper - (char *)task->tc_SPLower;
-    } else {
-	size = cli->cli_DefaultStack * 4;
-    }
-    return (ptr_t)(__base + GC_max(size, __stack));
-}
-#endif
-
-
-#endif
-
-
-#ifdef GC_AMIGA_DS
-/******************************************************************
-   Register data segments.
-******************************************************************/
-
-   void GC_register_data_segments()
-   {
-     struct Process	*proc;
-     struct CommandLineInterface *cli;
-     BPTR myseglist;
-     ULONG *data;
- 
-     int	num;
-
-
-#    ifdef __GNUC__
-        ULONG dataSegSize;
-        GC_bool found_segment = FALSE;
-	extern char __data_size[];
-
-	dataSegSize=__data_size+8;
-	/* Can`t find the Location of __data_size, because
-           it`s possible that is it, inside the segment. */
-
-#     endif
-
-	proc= (struct Process*)SysBase->ThisTask;
-
-	/* Reference: Amiga Guru Book Pages: 538ff,565,573
-		     and XOper.asm */
-	if (proc->pr_Task.tc_Node.ln_Type==NT_PROCESS) {
-	  if (proc->pr_CLI == NULL) {
-	    myseglist = proc->pr_SegList;
-	  } else {
-	    /* ProcLoaded	'Loaded as a command: '*/
-	    cli = BADDR(proc->pr_CLI);
-	    myseglist = cli->cli_Module;
-	  }
-	} else {
-	  ABORT("Not a Process.");
- 	}
-
-	if (myseglist == NULL) {
-	    ABORT("Arrrgh.. can't find segments, aborting");
- 	}
-
-	/* xoper hunks Shell Process */
-
-	num=0;
-        for (data = (ULONG *)BADDR(myseglist); data != NULL;
-             data = (ULONG *)BADDR(data[0])) {
-	  if (((ULONG) GC_register_data_segments < (ULONG) &data[1]) ||
-	      ((ULONG) GC_register_data_segments > (ULONG) &data[1] + data[-1])) {
-#             ifdef __GNUC__
-		if (dataSegSize == data[-1]) {
-		  found_segment = TRUE;
-		}
-# 	      endif
-	      GC_add_roots_inner((char *)&data[1],
-				 ((char *)&data[1]) + data[-1], FALSE);
-          }
-          ++num;
-        } /* for */
-# 	ifdef __GNUC__
-	   if (!found_segment) {
-	     ABORT("Can`t find correct Segments.\nSolution: Use an newer version of ixemul.library");
-	   }
-# 	endif
-  }
-
-#if 0 /* old version */
-  void GC_register_data_segments()
-  {
-    extern struct WBStartup *_WBenchMsg;
-    struct Process	*proc;
-    struct CommandLineInterface *cli;
-    BPTR myseglist;
-    ULONG *data;
-
-    if ( _WBenchMsg != 0 ) {
-	if ((myseglist = _WBenchMsg->sm_Segment) == 0) {
-	    GC_err_puts("No seglist from workbench\n");
-	    return;
-	}
-    } else {
-	if ((proc = (struct Process *)FindTask(0)) == 0) {
-	    GC_err_puts("Cannot find process structure\n");
-	    return;
-	}
-	if ((cli = BADDR(proc->pr_CLI)) == 0) {
-	    GC_err_puts("No CLI\n");
-	    return;
-	}
-	if ((myseglist = cli->cli_Module) == 0) {
-	    GC_err_puts("No seglist from CLI\n");
-	    return;
-	}
-    }
-
-    for (data = (ULONG *)BADDR(myseglist); data != 0;
-         data = (ULONG *)BADDR(data[0])) {
-#        ifdef AMIGA_SKIP_SEG
-           if (((ULONG) GC_register_data_segments < (ULONG) &data[1]) ||
-           ((ULONG) GC_register_data_segments > (ULONG) &data[1] + data[-1])) {
-#	 else
-      	   {
-#	 endif /* AMIGA_SKIP_SEG */
-          GC_add_roots_inner((char *)&data[1],
-          		     ((char *)&data[1]) + data[-1], FALSE);
-         }
-    }
-  }
-#endif /* old version */
-
-
-#endif
-
-
-
-#ifdef GC_AMIGA_AM
-
-#ifndef GC_AMIGA_FASTALLOC
-
-void *GC_amiga_allocwrapper(size_t size,void *(*AllocFunction)(size_t size2)){
-	return (*AllocFunction)(size);
-}
-
-void *(*GC_amiga_allocwrapper_do)(size_t size,void *(*AllocFunction)(size_t size2))
-	=GC_amiga_allocwrapper;
-
-#else
-
-
-
-
-void *GC_amiga_allocwrapper_firsttime(size_t size,void *(*AllocFunction)(size_t size2));
-
-void *(*GC_amiga_allocwrapper_do)(size_t size,void *(*AllocFunction)(size_t size2))
-	=GC_amiga_allocwrapper_firsttime;
-
-
-/******************************************************************
-   Amiga-spesific routines to obtain memory, and force GC to give
-   back fast-mem whenever possible.
-	These hacks makes gc-programs go many times faster when
-   the amiga is low on memory, and are therefore strictly necesarry.
-
-   -Kjetil S. Matheussen, 2000.
-******************************************************************/
-
-
-
-/* List-header for all allocated memory. */
-
-struct GC_Amiga_AllocedMemoryHeader{
-	ULONG size;
-	struct GC_Amiga_AllocedMemoryHeader *next;
-};
-struct GC_Amiga_AllocedMemoryHeader *GC_AMIGAMEM=(struct GC_Amiga_AllocedMemoryHeader *)(int)~(NULL);
-
-
-
-/* Type of memory. Once in the execution of a program, this might change to MEMF_ANY|MEMF_CLEAR */
-
-ULONG GC_AMIGA_MEMF = MEMF_FAST | MEMF_CLEAR;
-
-
-/* Prevents GC_amiga_get_mem from allocating memory if this one is TRUE. */
-#ifndef GC_AMIGA_ONLYFAST
-BOOL GC_amiga_dontalloc=FALSE;
-#endif
-
-#ifdef GC_AMIGA_PRINTSTATS
-int succ=0,succ2=0;
-int nsucc=0,nsucc2=0;
-int nullretries=0;
-int numcollects=0;
-int chipa=0;
-int allochip=0;
-int allocfast=0;
-int cur0=0;
-int cur1=0;
-int cur10=0;
-int cur50=0;
-int cur150=0;
-int cur151=0;
-int ncur0=0;
-int ncur1=0;
-int ncur10=0;
-int ncur50=0;
-int ncur150=0;
-int ncur151=0;
-#endif
-
-/* Free everything at program-end. */
-
-void GC_amiga_free_all_mem(void){
-	struct GC_Amiga_AllocedMemoryHeader *gc_am=(struct GC_Amiga_AllocedMemoryHeader *)(~(int)(GC_AMIGAMEM));
-	struct GC_Amiga_AllocedMemoryHeader *temp;
-
-#ifdef GC_AMIGA_PRINTSTATS
-	printf("\n\n"
-		"%d bytes of chip-mem, and %d bytes of fast-mem where allocated from the OS.\n",
-		allochip,allocfast
-	);
-	printf(
-		"%d bytes of chip-mem were returned from the GC_AMIGA_FASTALLOC supported allocating functions.\n",
-		chipa
-	);
-	printf("\n");
-	printf("GC_gcollect was called %d times to avoid returning NULL or start allocating with the MEMF_ANY flag.\n",numcollects);
-	printf("%d of them was a success. (the others had to use allocation from the OS.)\n",nullretries);
-	printf("\n");
-	printf("Succeded forcing %d gc-allocations (%d bytes) of chip-mem to be fast-mem.\n",succ,succ2);
-	printf("Failed forcing %d gc-allocations (%d bytes) of chip-mem to be fast-mem.\n",nsucc,nsucc2);
-	printf("\n");
-	printf(
-		"Number of retries before succeding a chip->fast force:\n"
-		"0: %d, 1: %d, 2-9: %d, 10-49: %d, 50-149: %d, >150: %d\n",
-		cur0,cur1,cur10,cur50,cur150,cur151
-	);
-	printf(
-		"Number of retries before giving up a chip->fast force:\n"
-		"0: %d, 1: %d, 2-9: %d, 10-49: %d, 50-149: %d, >150: %d\n",
-		ncur0,ncur1,ncur10,ncur50,ncur150,ncur151
-	);
-#endif
-
-	while(gc_am!=NULL){
-		temp=gc_am->next;
-		FreeMem(gc_am,gc_am->size);
-		gc_am=(struct GC_Amiga_AllocedMemoryHeader *)(~(int)(temp));
-	}
-}
-
-#ifndef GC_AMIGA_ONLYFAST
-
-/* All memory with address lower than this one is chip-mem. */
-
-char *chipmax;
-
-
-/*
- * Allways set to the last size of memory tried to be allocated.
- * Needed to ensure allocation when the size is bigger than 100000.
- *
- */
-size_t latestsize;
-
-#endif
-
-
-/*
- * The actual function that is called with the GET_MEM macro.
- *
- */
-
-void *GC_amiga_get_mem(size_t size){
-	struct GC_Amiga_AllocedMemoryHeader *gc_am;
-
-#ifndef GC_AMIGA_ONLYFAST
-	if(GC_amiga_dontalloc==TRUE){
-//		printf("rejected, size: %d, latestsize: %d\n",size,latestsize);
-		return NULL;
-	}
-
-	// We really don't want to use chip-mem, but if we must, then as little as possible.
-	if(GC_AMIGA_MEMF==(MEMF_ANY|MEMF_CLEAR) && size>100000 && latestsize<50000) return NULL;
-#endif
-
-	gc_am=AllocMem((ULONG)(size + sizeof(struct GC_Amiga_AllocedMemoryHeader)),GC_AMIGA_MEMF);
-	if(gc_am==NULL) return NULL;
-
-	gc_am->next=GC_AMIGAMEM;
-	gc_am->size=size + sizeof(struct GC_Amiga_AllocedMemoryHeader);
-	GC_AMIGAMEM=(struct GC_Amiga_AllocedMemoryHeader *)(~(int)(gc_am));
-
-//	printf("Allocated %d (%d) bytes at address: %x. Latest: %d\n",size,tot,gc_am,latestsize);
-
-#ifdef GC_AMIGA_PRINTSTATS
-	if((char *)gc_am<chipmax){
-		allochip+=size;
-	}else{
-		allocfast+=size;
-	}
-#endif
-
-	return gc_am+1;
-
-}
-
-
-
-
-#ifndef GC_AMIGA_ONLYFAST
-
-/* Tries very hard to force GC to find fast-mem to return. Done recursively
- * to hold the rejected memory-pointers reachable from the collector in an
- * easy way.
- *
- */
-#ifdef GC_AMIGA_RETRY
-void *GC_amiga_rec_alloc(size_t size,void *(*AllocFunction)(size_t size2),const int rec){
-	void *ret;
-
-	ret=(*AllocFunction)(size);
-
-#ifdef GC_AMIGA_PRINTSTATS
-	if((char *)ret>chipmax || ret==NULL){
-		if(ret==NULL){
-			nsucc++;
-			nsucc2+=size;
-			if(rec==0) ncur0++;
-			if(rec==1) ncur1++;
-			if(rec>1 && rec<10) ncur10++;
-			if(rec>=10 && rec<50) ncur50++;
-			if(rec>=50 && rec<150) ncur150++;
-			if(rec>=150) ncur151++;
-		}else{
-			succ++;
-			succ2+=size;
-			if(rec==0) cur0++;
-			if(rec==1) cur1++;
-			if(rec>1 && rec<10) cur10++;
-			if(rec>=10 && rec<50) cur50++;
-			if(rec>=50 && rec<150) cur150++;
-			if(rec>=150) cur151++;
-		}
-	}
-#endif
-
-	if (((char *)ret)<=chipmax && ret!=NULL && (rec<(size>500000?9:size/5000))){
-		ret=GC_amiga_rec_alloc(size,AllocFunction,rec+1);
-//		GC_free(ret2);
-	}
-
-	return ret;
-}
-#endif
-
-
-/* The allocating-functions defined inside the amiga-blocks in gc.h is called
- * via these functions.
- */
-
-
-void *GC_amiga_allocwrapper_any(size_t size,void *(*AllocFunction)(size_t size2)){
-	void *ret,*ret2;
-
-	GC_amiga_dontalloc=TRUE;	// Pretty tough thing to do, but its indeed necesarry.
-	latestsize=size;
-
-	ret=(*AllocFunction)(size);
-
-	if(((char *)ret) <= chipmax){
-		if(ret==NULL){
-			//Give GC access to allocate memory.
-#ifdef GC_AMIGA_GC
-			if(!GC_dont_gc){
-				GC_gcollect();
-#ifdef GC_AMIGA_PRINTSTATS
-				numcollects++;
-#endif
-				ret=(*AllocFunction)(size);
-			}
-#endif
-			if(ret==NULL){
-				GC_amiga_dontalloc=FALSE;
-				ret=(*AllocFunction)(size);
-				if(ret==NULL){
-					WARN("Out of Memory!  Returning NIL!\n", 0);
-				}
-			}
-#ifdef GC_AMIGA_PRINTSTATS
-			else{
-				nullretries++;
-			}
-			if(ret!=NULL && (char *)ret<=chipmax) chipa+=size;
-#endif
-		}
-#ifdef GC_AMIGA_RETRY
-		else{
-			/* We got chip-mem. Better try again and again and again etc., we might get fast-mem sooner or later... */
-			/* Using gctest to check the effectiviness of doing this, does seldom give a very good result. */
-			/* However, real programs doesn't normally rapidly allocate and deallocate. */
-//			printf("trying to force... %d bytes... ",size);
-			if(
-				AllocFunction!=GC_malloc_uncollectable
-#ifdef ATOMIC_UNCOLLECTABLE
-				&& AllocFunction!=GC_malloc_atomic_uncollectable
-#endif
-			){
-				ret2=GC_amiga_rec_alloc(size,AllocFunction,0);
-			}else{
-				ret2=(*AllocFunction)(size);
-#ifdef GC_AMIGA_PRINTSTATS
-				if((char *)ret2<chipmax || ret2==NULL){
-					nsucc++;
-					nsucc2+=size;
-					ncur0++;
-				}else{
-					succ++;
-					succ2+=size;
-					cur0++;
-				}
-#endif
-			}
-			if(((char *)ret2)>chipmax){
-//				printf("Succeeded.\n");
-				GC_free(ret);
-				ret=ret2;
-			}else{
-				GC_free(ret2);
-//				printf("But did not succeed.\n");
-			}
-		}
-#endif
-	}
-
-	GC_amiga_dontalloc=FALSE;
-
-	return ret;
-}
-
-
-
-void (*GC_amiga_toany)(void)=NULL;
-
-void GC_amiga_set_toany(void (*func)(void)){
-	GC_amiga_toany=func;
-}
-
-#endif // !GC_AMIGA_ONLYFAST
-
-
-void *GC_amiga_allocwrapper_fast(size_t size,void *(*AllocFunction)(size_t size2)){
-	void *ret;
-
-	ret=(*AllocFunction)(size);
-
-	if(ret==NULL){
-		// Enable chip-mem allocation.
-//		printf("ret==NULL\n");
-#ifdef GC_AMIGA_GC
-		if(!GC_dont_gc){
-			GC_gcollect();
-#ifdef GC_AMIGA_PRINTSTATS
-			numcollects++;
-#endif
-			ret=(*AllocFunction)(size);
-		}
-#endif
-		if(ret==NULL){
-#ifndef GC_AMIGA_ONLYFAST
-			GC_AMIGA_MEMF=MEMF_ANY | MEMF_CLEAR;
-			if(GC_amiga_toany!=NULL) (*GC_amiga_toany)();
-			GC_amiga_allocwrapper_do=GC_amiga_allocwrapper_any;
-			return GC_amiga_allocwrapper_any(size,AllocFunction);
-#endif
-		}
-#ifdef GC_AMIGA_PRINTSTATS
-		else{
-			nullretries++;
-		}
-#endif
-	}
-
-	return ret;
-}
-
-void *GC_amiga_allocwrapper_firsttime(size_t size,void *(*AllocFunction)(size_t size2)){
-	atexit(&GC_amiga_free_all_mem);
-	chipmax=(char *)SysBase->MaxLocMem;		// For people still having SysBase in chip-mem, this might speed up a bit.
-	GC_amiga_allocwrapper_do=GC_amiga_allocwrapper_fast;
-	return GC_amiga_allocwrapper_fast(size,AllocFunction);
-}
-
-
-#endif //GC_AMIGA_FASTALLOC
-
-
-
-/*
- * The wrapped realloc function.
- *
- */
-void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes){
-#ifndef GC_AMIGA_FASTALLOC
-	return GC_realloc(old_object,new_size_in_bytes);
-#else
-	void *ret;
-	latestsize=new_size_in_bytes;
-	ret=GC_realloc(old_object,new_size_in_bytes);
-	if(ret==NULL && GC_AMIGA_MEMF==(MEMF_FAST | MEMF_CLEAR)){
-		/* Out of fast-mem. */
-#ifdef GC_AMIGA_GC
-		if(!GC_dont_gc){
-			GC_gcollect();
-#ifdef GC_AMIGA_PRINTSTATS
-			numcollects++;
-#endif
-			ret=GC_realloc(old_object,new_size_in_bytes);
-		}
-#endif
-		if(ret==NULL){
-#ifndef GC_AMIGA_ONLYFAST
-			GC_AMIGA_MEMF=MEMF_ANY | MEMF_CLEAR;
-			if(GC_amiga_toany!=NULL) (*GC_amiga_toany)();
-			GC_amiga_allocwrapper_do=GC_amiga_allocwrapper_any;
-			ret=GC_realloc(old_object,new_size_in_bytes);
-#endif
-		}
-#ifdef GC_AMIGA_PRINTSTATS
-		else{
-			nullretries++;
-		}
-#endif
-	}
-	if(ret==NULL){
-		WARN("Out of Memory!  Returning NIL!\n", 0);
-	}
-#ifdef GC_AMIGA_PRINTSTATS
-	if(((char *)ret)<chipmax && ret!=NULL){
-		chipa+=new_size_in_bytes;
-	}
-#endif
-	return ret;
-#endif
-}
-
-#endif //GC_AMIGA_AM
-
-
diff --git a/boehm-gc/BCC_MAKEFILE b/boehm-gc/BCC_MAKEFILE
deleted file mode 100644
index e21bc3d8dfe..00000000000
--- a/boehm-gc/BCC_MAKEFILE
+++ /dev/null
@@ -1,88 +0,0 @@
-# Makefile for Borland C++ 5.5 on NT

-# If you have the Borland assembler, remove "-DUSE_GENERIC"

-#

-bc=	   c:\Borland\BCC55

-bcbin=	   $(bc)\bin

-bclib=	   $(bc)\lib

-bcinclude= $(bc)\include

-

-gcinclude1 = $(bc)\gc6.2\include

-gcinclude2 = $(bc)\gc6.2\cord

-

-cc=	 $(bcbin)\bcc32

-rc=	 $(bcbin)\brc32

-lib=	 $(bcbin)\tlib

-link=	 $(bcbin)\ilink32

-cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1);$(gcinclude2) -L$(bclib) \

-	 -w-pro -w-aus -w-par -w-ccc -w-rch -a4 -D__STDC__=0

-#defines= -DSILENT

-defines= -DSILENT -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY

-

-.c.obj:

-	$(cc) @&&|

-	$(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.c

-|

-

-.cpp.obj:

-	$(cc) @&&|

-	$(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.cpp

-|

-

-.rc.res:

-    $(rc) -i$(bcinclude) -r -fo$* $*.rc

-

-XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \

-    XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \

-    XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \

-    XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \

-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj

-

-OBJS= $(XXXOBJS:XXX=)

-

-all: gctest.exe cord\de.exe test_cpp.exe

-

-$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE

-

-gc.lib: $(OBJS)

-	del gc.lib

-	$(lib) $* @&&|

-	$(XXXOBJS:XXX=+)

-|

-

-gctest.exe: tests\test.obj gc.lib

-    $(cc) @&&|

-	$(cflags) -W -e$* tests\test.obj gc.lib

-|

-

-cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h \

-    cord\de_cmds.h

-

-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj \

-	cord\de_win.res gc.lib

-	$(cc) @&&|

-	$(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \

-	cord\de.obj cord\de_win.obj gc.lib

-|

-    $(rc) cord\de_win.res cord\de.exe

-

-gc_cpp.obj: include\gc_cpp.h include\gc.h

-

-gc_cpp.cpp: gc_cpp.cc

-	copy gc_cpp.cc gc_cpp.cpp

-

-test_cpp.cpp: tests\test_cpp.cc

-	copy tests\test_cpp.cc test_cpp.cpp

-

-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib

-    $(cc) @&&|

-	$(cflags) -W -e$* test_cpp.obj gc.lib

-|

-

-scratch:

-    -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm

-

-clean:

-      del gc.lib

-      del *.obj

-      del tests\test.obj

-

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
deleted file mode 100644
index 2cb91b44c97..00000000000
--- a/boehm-gc/ChangeLog
+++ /dev/null
@@ -1,2679 +0,0 @@
-2016-11-15  Matthias Klose  <doko@ubuntu.com>
-
-	* configure: Regenerate.
-
-2016-03-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* configure.host: Set gc_use_mmap on *-kfreebsd-gnu* and *-gnu*.
-	* include/private/gcconfig.h [HURD && USE_MMAP]: Define
-	USE_MMAP_ANON.
-
-2016-03-16  Andreas Schwab  <schwab@suse.de>
-
-	* include/private/gcconfig.h [AARCH64] (ALIGNMENT, CPP_WORDSZ):
-	Define for __ILP32__.
-
-2015-10-09  David Malcolm  <dmalcolm@redhat.com>
-
-	* testsuite/lib/boehm-gc.exp: Load multiline.exp before
-	prune.exp, using load_gcc_lib.
-
-2015-08-27  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* os_dep.c [GC_SOLARIS_THREADS] (GC_dirty_init): Use
-	/proc/<pid>/pagedata instead of PIOCOPENPD.
-
-2015-07-24  Michael Darling  <darlingm@gmail.com>
-
-	PR other/66259
-	* Makefile.direct: Reflects renaming of configure.in to configure.ac
-	* Makefile.dist: Likewise
-	* version.h: Likewise
-	* doc/README: Likewise
-
-2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
-
-	* Makefile.in: Regenerated with automake-1.11.6.
-	* aclocal.m4: Likewise.
-	* configure: Likewise.
-	* include/Makefile.in: Likewise.
-	* include/gc_config.h.in: Likewise.
-	* testsuite/Makefile.in: Likewise.
-
-2014-12-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* testsuite/lib/boehm-gc.exp: Load target-utils.exp.
-
-2014-11-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR bootstrap/63784
-	* configure: Regenerated.
-
-2014-11-11  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
-
-	PR target/63610
-	* configure: Regenerate.
-
-2014-10-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* include/gc.h [(sparc || __sparc) && sun] (GC_INIT): Remove
-	comment and definition.
-
-2014-10-06  Marek Polacek  <polacek@redhat.com>
-
-	* testsuite/boehm-gc.c/gctest.c: Fix defaulting to int.
-
-2014-05-13  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	Fix current cygwin-64 build problems.
-	* include/gc_config_macros.h (GC_PTHREADS): Use __CYGWIN__ instead
-	of __CYGWIN32__ here.
-	* win32_threads.c (GC_push_all_stacks): Push all X86_64 registers.
-	(GC_get_thread_stack_base): Get the stack base for X86_64.
-
-2014-04-22  Jakub Jelinek  <jakub@redhat.com>
-
-	PR other/43620
-	* Makefile.am (AUTOMAKE_OPTIONS): Add no-dist.
-	* include/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
-	* testsuite/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
-	* Makefile.in: Regenerated.
-	* include/Makefile.in: Regenerated.
-	* testsuite/Makefile.in: Regenerated.
-
-2013-12-21  Andreas Tobler  <andreast@gcc.gnu.org>
-
-	* include/private/gcconfig.h: Add FreeBSD powerpc64 defines.
-
-2013-09-20  Alan Modra  <amodra@gmail.com>
-
-	* configure: Regenerate.
-
-2013-09-04  Matthias Klose  <doko@ubuntu.com>
-
-	* Makefile.am (libgcjgc_la_LIBADD): Add EXTRA_TEST_LIBS.
-	* Makefile.in: Regenerate.
-
-2013-03-16  Yvan Roux <yvan.roux@linaro.org>
-
-	* include/private/gcconfig.h (AARCH64): New macro (defined only if
-	__aarch64__).
-	(CPP_WORDSZ): Define for AArch64.
-	(MACH_TYPE): Likewise.
-	(ALIGNMENT): Likewise.
-	(HBLKSIZE): Likewise.
-	(OS_TYPE): Likewise.
-	(LINUX_STACKBOTTOM): Likewise.
-	(USE_GENERIC_PUSH_REGS): Likewise.
-	(DYNAMIC_LOADING): Likewise.
-	(DATASTART): Likewise.
-	(DATAEND): Likewise.
-	(STACKBOTTOM): Likewise.
-	(NOSYS): Likewise.
-	(mach_type_known): Define for AArch64 and comment update.
-
-2013-03-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* os_dep.c [SOLARIS_STACKBOTTOM] (GC_solaris_stack_base): New
-	function.
-	[!BEOS && !AMIGA && !MSWIN32 && !MSWINCE && !OS2 && !NOSYS &&
-	!ECOS] (GC_get_stack_base): Use it.
-	* include/private/gcconfig.h [SPARC && SUNOS5]
-	(SOLARIS_STACKBOTTOM): Define.
-	(STACKBOTTOM, HEURISTIC2): Remove.
-	[I386 && SUNOS5]
-	(SOLARIS_STACKBOTTOM): Define.
-	(STACKBOTTOM): Remove.
-
-2012-11-04  Samuel Thibault  <samuel.thibault@gnu.org>
-
-	* configure.ac: Add stanza for *-*-gnu* threads configuration.
-	* configure: Regenerate.
-	* include/gc_config.h.in: Likewise.
-	* dyn_load.c (_GNU_SOURCE): Define for __GNU__.
-	* include/gc_config_macros.h (_REENTRANT, GC_PTHREADS): Define for
-	GC_GNU_THREADS.
-	* include/private/gcconfig.h (DATASTART): Don't define for I386 &&
-	HURD.
-	(SIG_SUSPEND, SIG_THR_RESTART, SEARCH_FOR_DATA_START): Define for
-	I386 && HURD.
-	(UNIX_LIKE, REGISTER_LIBRARIES_EARLY): Define for HURD.
-	* os_dep.c (GC_init_linux_data_start): Handle for HURD.
-	* pthread_support.c (GC_thr_init): Add case for GC_GNU_THREADS.
-	* specific.c: Use for GC_GNU_THREADS.
-	* threadlibs.c: Add case for GC_GNU_THREADS.
-
-2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
-
-	* configure: Regenerated.
-
-2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* configure: Regenerated.
-
-2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
-
-	Merge upstream changes
-	* include/private/gcconfig.h: (ALIGNMENT): Set to 4 for x32.
-	(CPP_WORDSZ): Set to 32 for x32.
-
-2012-02-27  Jack Howarth  <howarth@bromo.med.uc.edu>
-	    Patrick Marlier  <patrick.marlier@gmail.com>
-
-	PR boehm-gc/48299
-	* testsuite/boehm-gc.c/thread_leak_test.c: Merge upstream changes.
-
-2012-02-23  Patrick Marlier  <patrick.marlier@gmail.com>
-	    Jack Howarth  <howarth@bromo.med.uc.edu>
-
-	PR boehm-gc/52179
-	* include/gc_config.h.in: Undefine HAVE_PTHREAD_GET_STACKADDR_NP.
-	* include/private/gcconfig.h (DARWIN): Define STACKBOTTOM with
-	pthread_get_stackaddr_np when available.
-	* configure.ac (THREADS): Check availability of pthread_get_stackaddr_np.
-	* configure: Regenerate.
-
-2012-02-10  Kai Tietz  <ktietz@redhat.com>
-
-	PR boehm-gc/48514
-	* include/gc_config_macros.h (GC_DLL): Define it for mingw-targets
-	only, if we are actual in boehm-gc's build and DLL_EXPORT
-	is defined.
-
-2011-11-21  Andreas Tobler  <andreast@fgznet.ch>
-
-	* configure: Regenerate.
-
-2011-08-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (THREADS): Remove posix95.
-	* configure: Regenerate.
-
-2011-07-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR target/39150
-	* configure.ac (i?86-*-solaris2.[89]): Also accept
-	x86_64-*-solaris2.1?.
-	* configure: Regenerate.
-
-2011-06-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR libgcj/49451
-	* include/private/gcconfig.h [IRIX5 && _MIPS_SZPTR == 64]
-	(ELF_CLASS): Define.
-	* dyn_load.c [IRIX5]: Include <elf.h>.
-	Include <obj.h> for O32, <objlist.h> for N32, N64.
-	[SUNOS5DL && USE_PROC_FOR_LIBRARIES] (obj_offset): Define.
-	[SUNOS4 && USE_PROC_FOR_LIBRARIES] (obj_offset): Define.
-	[IRIX5 && !USE_PROC_FOR_LIBRARIES] (struct link_map): Define.
-	(__rld_obj_head): Declare.
-	(l_next, l_addr, obj_offset): Define.
-	(GC_FirstDLOpenedLinkMap): New function.
-	[SUNOS4 || SUNOS5DL] (GC_register_dynamic_libraries): Also use on
-	IRIX5.
-	Use obj_offset.
-	[IRIX5 || (USE_PROC_FOR_LIBRARIES && !LINUX]
-	(GC_register_dynamic_libraries): Don't use /proc version on IRIX5.
-
-2011-04-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (THREADS): Remove decosf1, irix, mach, os2.
-	* configure: Regenerate
-
-2011-04-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR testsuite/48480
-	* testsuite/lib/boehm-gc.exp (boehm-gc-dg-prune): Allow for path
-	to ranlib.
-
-2011-03-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR boehm-gc/11412
-	* configure.ac (THREADCFLAGS): New variable.
-	Use it instead of INCLUDES, AM_CPPFLAGS.
-	<*-*-kfreebsd*-gnu> (THREADDLLIBS): Rename to THREADLIBS.
-	Remove DG/UX support.
-	(AC_CONFIG_FILES): Add testsuite/Makefile.
-	* Makefile.am (AUTOMAKE_OPTIONS): Use foreign instead of cygnus.
-	(SUBDIRS): Add testsuite.
-	(libgcjgc_la_LIBADD): Remove $(UNWINDLIBS).
-	(AM_CXXFLAGS): Add $(THREADCFLAGS).
-	(AM_CFLAGS): Likewise.
-	Remove TESTS related variables.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	* testsuite/Makefile.am: New file.
-	* testsuite/Makefile.in: New file.
-	* testsuite/lib/boehm-gc.exp: New file.
-	* testsuite/config/default.exp: New file.
-	* testsuite/boehm-gc.c/c.exp: New file.
-	* testsuite/boehm-gc.lib/lib.exp: New file.
-	* tests/test.c: Move ...
-	* testsuite/boehm-gc.c/gctest.c: ... here.
-	* tests/leak_test.c, tests/middle.c, tests/thread_leak_test.c,
-	tests/trace_test.c: Move ...
-	* testsuite/boehm-gc.c: ... here.
-	* testsuite/boehm-gc.c/trace_test.c: Skip everywhere.
-	* tests/staticrootslib.c, tests/staticrootstest.c: Move ...
-	* testsuite/boehm-gc.lib: ... here.
-	* testsuite/boehm-gc.lib/staticrootstest.c: Use dg-add-shlib
-	staticrootslib.c.
-	* tests/test_cpp.cc: Move ...
-	* testsuite/boehm-gc.c++: ... here.
-
-2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (THREADS): Remove solaris.
-	* configure: Regenerate.
-
-2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* configure: Regenerate.
-
-2011-02-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac: Don't use libdl on mips-sgi-irix6*.
-	* configure: Regenerate.
-
-2011-01-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (*-*-solaris2*): Add -lrt to THREADLIBS.
-	* configure: Regenerate.
-
-2010-12-10  Iain Sandoe  <iains@gcc.gnu.org>
-
-	* powerpc_darwin_mach_dep.s:  Update for m64.  Add eh frames.
-	Do not build or use the picsymbol stub for Darwin >= 9.
-	* tests/test.c (reverse_test):  Modify count for ppc64-darwin.
-	* pthread_support.c (GC_get_thread_stack_base): Correct a debug
-	statement.
-
-2010-11-29  Iain Sandoe  <iains@gcc.gnu.org>
-	    Mike Stump  <mrs@gcc.gnu.org>
-
-	PR target/26427
-	PR target/33120
-	PR testsuite/35710
-	* dyn_load.c (GC_register_dynamic_libraries/DARWIN):  Add new writable
-	data section names.
-	(GC_dyld_name_for_hdr): Adjust layout.
-	(GC_dyld_image_add): Adjust layout, add new Darwin sections, adjust
-	debug to name the sections.
-	(GC_dyld_image_remove): Adjust layout, remove new Darwin sections,
-	adjust debug to name the sections.
-	(GC_register_dynamic_libraries): Adjust layout.
-	(GC_init_dyld): Likewise.
-	(GC_register_main_static_data): Likewise.
-
-2010-10-29  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure: Regenerate.
-
-2010-10-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.ac: Rewrite DGUX check to use GC_CFLAGS, and -O0 check
-	to remove the need for MY_CFLAGS.
-	* Makefile.am: Do not use @...@ substitutions.  Use AM_CXXFLAGS,
-	AM_CFLAGS and AM_LDFLAGS instead of redefining LTCOMPILE and LINK.
-	Use "override" to disable -O2 when required.
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2010-10-11  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* dyn_load.c: Fix typo.
-	* pthread_support.c (GC_get_thread_stack_base) [DEBUG_THREADS]:
-	Use GC_printf0.
-
-2010-06-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (*-*-solaris2.8*): Only usr alternate thread
-	library on Solaris 8.
-	(*-*-solaris2*): Use regular thread library otherwise.
-	* configure: Regenerate.
-
-2010-05-13  Uros Bizjak  <ubizjak@gmail.com>
-
-	* tests/leak_test.c (main): Declare as int.  Return 0.
-	* tests/thread_leak_test.c (main): Ditto.
-	* tests/trace_test.c (main): Ditto.
-
-2010-05-06  Dave Korn  <dave.korn.cygwin@gmail.com>
-
-	PR target/42811
-	* tests/staticrootstest.c: New test source file.
-	* tests/staticrootslib.c: New test library source file.
-	* Makefile.am (test_ldadd): New variable.
-	(gctest_LDADD): Use it.
-	(TESTS): Add leaktest, middletest and staticrootstest.
-	(check_PROGRAMS): Likewise.
-	(leaktest_SOURCES): New libtool variable definition.
-	(leaktest_LDADD): Likewise.
-	(leaktest_LDFLAGS): Likewise.
-	(leaktest_LINK): Likewise.
-	(middletest_SOURCES): Likewise.
-	(middletest_LDADD): Likewise.
-	(middletest_LDFLAGS): Likewise.
-	(middletest_LINK): Likewise.
-	(staticrootstest_SOURCES): Likewise.
-	(staticrootstest_LDADD): Likewise.
-	(staticrootstest_LDFLAGS): Likewise.
-	(staticrootstest_LINK): Likewise.
-	(check_LTLIBRARIES): Likewise.
-	(libstaticrootslib_la_SOURCES): Likewise.
-	(libstaticrootslib_la_LIBADD): Likewise.
-	(libstaticrootslib_la_LDFLAGS): Likewise.
-	(libstaticrootslib_la_DEPENDENCIES): Likewise.
-	* Makefile.in: Regenerate.
-
-2010-04-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.in: Regenerate.
-	* aclocal.m4: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2010-03-21  Dave Korn  <dave.korn.cygwin@gmail.com>
-
-	PR target/42811 (prerequisite)
-	* include/private/gc_priv.h (struct roots) [CYGWIN32]: Don't
-	declare r_next member on Cygwin as on other windows hosts.
-	(LOG_RT_SIZE) [CYGWIN32]: Don't define likewise.
-	(RT_SIZE) [CYGWIN32]: Likewise.
-	(struct _GC_arrays) [CYGWIN32]: Do declare _heap_bases[] member
-	likewise.
-	(GC_heap_bases) [CYGWIN32]: Do define likewise.
-	(struct _SYSTEM_INFO) [CYGWIN32]: Do forward-declare likewise.
-	(GC_sysinfo) [CYGWIN32]: Do declare extern likewise.
-	(GC_n_heap_bases) [CYGWIN32]: Likewise.
-	(GC_is_tmp_root) [CYGWIN32]: Do prototype likewise.
-	* include/private/gcconfig.h (GC_win32_get_mem) [CYGWIN32]: Likewise.
-	(GET_MEM) [CYGWIN32]: Do define likewise.
-	* boehm-gc/ptr_chck.c (GC_is_visible) [CYGWIN32]: Do handle dynamic
-	registration likewise.
-	* boehm-gc/os_dep.c (GC_setpagesize) [CYGWIN32]: Do define likewise.
-	(GC_no_win32_dlls) [CYGWIN32]: Define as constant false, unlike
-	other windows hosts.
-	(GC_sysinfo) [CYGWIN32]: Define as on other windows hosts.
-	(GC_n_heap_bases) [CYGWIN32]: Likewise.
-	(GLOBAL_ALLOC_TEST) [CYGWIN32]: Likewise.
-	(GC_win32_get_mem) [CYGWIN32]: Likewise, but wrapping GC_unix_get_mem
-	rather than GlobalAlloc/VirtualAlloc.
-	(GC_win32_free_heap) [CYGWIN32]: Likewise, but wrapping free instead
-	of GlobalFree (even though the function body is optimised away).
-	* boehm-gc/mark_rts.c (add_roots_to_index) [CYGWIN32]: Define as on
-	other windows hosts.
-	(GC_add_roots_inner) [CYGWIN32]: Avoid overlapping or adjacent
-	intervals likewise.
-	(GC_clear_roots) [CYGWIN32]: Clear GC_root_index[] likewise.
-	(GC_rebuild_root_index) [CYGWIN32]: Define as on other windows hosts.
-	(GC_remove_tmp_roots) [CYGWIN32]: Call it likewise.
-	(GC_remove_roots) [CYGWIN32]: Don't define, as on other windows hosts.
-	(GC_is_tmp_root) [CYGWIN32]: Define, as on other windows hosts.
-	(GC_cond_register_dynamic_libraries) [CYGWIN32]: Handle temporary
-	roots and dynamic registration likewise.
-	* boehm-gc/dyn_load.c (GC_has_static_roots) [CYGWIN32]: Define as on
-	other windows hosts.
-	(GC_register_has_static_roots_callback) [CYGWIN32]: Likewise.
-	(GC_cond_add_roots) [CYGWIN32]: Likewise.
-	(GC_register_main_static_data) [CYGWIN32]: Define to always return
-	false, as on MSWINCE
-	(HAVE_REGISTER_MAIN_STATIC_DATA) [CYGWIN32]: Define as on other
-	windows hosts.
-	(GC_warn_fb) [CYGWIN32]: Likewise.
-	(GC_disallow_ignore_fb) [CYGWIN32]: Likewise.
-	(GC_ignore_fb_mb) [CYGWIN32]: Likewise.
-	(GC_ignore_fb) [CYGWIN32]: Likewise.
-	(is_frame_buffer) [CYGWIN32]: Likewise.
-	(GC_dump_meminfo) [CYGWIN32]: Likewise.
-	(GC_wnt) [CYGWIN32]: Define to constant true.
-	(GC_register_dynamic_libraries) [CYGWIN32]: Define as on other
-	windows hosts.
-
-2009-12-09  Matthias Klose  <doko@ubuntu.com> 
-
-	* include/private/gc_locks.h: For __ARM_EABI__ define
-	GC_test_and_set  GC_clear to use the atomic builtins.
-
-2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2009-11-30  Ben Elliston  <bje@au.ibm.com>
-
-	* mark_rts.c (GC_approx_sp): Use __builtin_frame_address when
-	compiling with GCC rather than taking the address of a local
-	variable.
-
-2009-11-30  Ben Elliston  <bje@au.ibm.com>
-
-	* os_dep.c: Use the POSIX signal API in preference to the BSD API.
-	Generate a compilation error if neither the POSIX nor BSD APIs can
-	be detected.
-
-2009-09-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.am (libgcjgc_la_LINK, gctest_LINK): New.
-	(gctest_LDADD): Depend on libgcjgc.la instead of ./libgcjgc.la,
-	so that library dependency resolution works with portable make.
-	* Makefile.in: Regenerate.
-
-2009-09-08  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure: Rebuilt with modified libtool.m4.
-
-2009-09-03  Loren J. Rittle  <ljrittle@acm.org>
-
-	* dyn_load.c (HAVE_DL_ITERATE_PHDR): Break definition from use.
-	Define for FreeBSD 7.0+.
-
-2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* configure.ac (AC_PREREQ): Bump to 2.64.
-
-2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.am (install-html, install-pdf): Remove.
-	* Makefile.in: Regenerate.
-
-	* Makefile.in: Regenerate.
-	* aclocal.m4: Regenerate.
-	* configure: Regenerate.
-	* include/Makefile.in: Regenerate.
-	* include/gc_config.h.in: Regenerate.
-
-2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.am (LTCOMPILE, LTLINK): Add $(AM_LIBTOOLFLAGS)
-	and $(LIBTOOLFLAGS).
-	* Makefile.in: Regenerate.
-
-2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
-
-2009-07-17  Michael Meissner  <meissner@linux.vnet.ibm.com>
-
-	PR boehm-gc/40785
-	* include/private/gc_locks.h (GC_test_and_set): If GCC 4.4, use
-	the __sync_lock_test_and _set and __sync_lock_release builtins on
-	the powerpc.  If not GCC 4.4, fix up the constraints so that it
-	builds without error.
-	(GC_clear): Ditto.
-
-2009-07-17  Kai Tietz  <kai.tietz@onevision.com>
-
-	* configure.ac: Add rule for mingw targets to add -DGC_BUILD=1 to
-	cflags.
-	* configure: Regenerated.
-
-2009-05-17  Dave Korn  <dave.korn.cygwin@gmail.com>
-
-	* win32_threads.c (GC_get_thread_stack_base):  Implement for Cygwin.
-
-2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* configure: Regenerate.
-
-2009-02-09  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.am (LTLDFLAGS): New variable.
-	(LINK): Use it.
-	* Makefile.in: Regenerated.
-
-2008-12-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* configure: Regenerate.
-
-2008-09-26  Peter O'Gorman  <pogma@thewrittenword.com>
-	    Steve Ellcey  <sje@cup.hp.com>
-
-	* configure: Regenerate for new libtool.
-	* Makefile.in: Ditto.
-	* include/Makefile.in: Ditto.
-	* aclocal.m4: Ditto.
-
-2008-07-18  Matthias Klose  <doko@ubuntu.com> 
- 
-	* configure.ac (AC_CONFIG_FILES): Add threads.mk. 
-	* threads.mk.in: New. 
-	* Makefile.in, configure: Regenerate. 
-
-2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	* include/Makefile.in: Regenerate.
-	* include/gc_config.h.in: Regenerate.
-
-2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/35457
-	* aclocal.m4: Regenerate.
-	* configure: Regenerate.
-
-2008-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* aclocal.m4: Regenerate.
-	* configure: Likewise.
-	* Makefile.in: Likewise.
-	* include/Makefile.in: Likewise.
-
-2007-02-19  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* dyn_load.c (GC_dyld_image_add): Remove ifdef clause and use the macro
-	GC_GETSECTBYNAME instead.
-	* include/private/gc_priv.h: Define GC_GETSECTBYNAME according to the
-	architecture (Darwin).
-
-2008-01-26  Richard Sandiford  <rsandifo@nildram.co.uk>
-
-	* include/private/gcconfig.h (HBLKSIZE): Define for MIPS.
-
-2008-01-24  David Edelsohn  <edelsohn@gnu.org>
-
-	* configure: Regenerate.
-
-2007-10-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-
-	PR boehm-gc/33442
-	* pthread_support.c (GC_PTR GC_get_thread_stack_base): If stack grows
-	up, return stack_addr instead of stack_addr - stack_size.
-
-2007-08-14  David Daney  <ddaney@avtrex.com>
-
-	* include/private/gcconfig.h: Handle mips64-linux n64 ABI.
-
-2007-07-05  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* aclocal.m4: Regenerated.
-
-2007-07-02  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	PR boehm-gc/21940
-	PR boehm-gc/21942
-	* configure.ac (GC_SOLARIS_THREADS): Don't define on *-*-solaris*.
-	Use alternate thread library in /usr/lib/lwp.
-	* configure: Regenerate.
-	* dyn_load.c: Use GC_SOLARIS_PTHREADS.
-	* include/gc_config_macros.h (GC_SOLARIS_THREADS): Don't define.
-	* include/private/gcconfig.h: Handle 64-bit Solaris 2/x86.
-	(GC_SOLARIS_THREADS): Don't define.
-	* include/private/solaris_threads.h: Remove.
-	* pthread_support.c (GC_thr_init) [GC_SOLARIS_PTHREADS]: Determine
-	GC_nprocs via sysconf().
-	* Makefile.am (libgcjgc_la_SOURCES): Remove solaris_pthreads.c and
-	solaris_threads.c.
-	(gctest_LDADD): Use THREADLIBS instead of THREADDLLIBS.
-	* Makefile.in: Regenerate.	 
-	* solaris_pthreads.c: Remove.
-	* solaris_threads.c: Remove.
-
-2007-06-22  Jakub Jelinek  <jakub@redhat.com>
-
-	* pthread_support.c (GC_get_thread_stack_base): Handle
-	pthread_getattr_np failures.
-
-2007-06-02  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure: Regenerate.
-
-2007-05-23  Steve Ellcey  <sje@cup.hp.com>
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	* aclocal.m4: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2007-05-20  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* configure.ac: Introduce extra_ldflags_libgc. Use it for Darwin.
-	* configure: Regenerate.
-	* Makefile.am (libgc_la_LDFLAGS): Use extra_ldflags_libgc.
-	* Makefile.in: Regenerate.
-	* include/Makefile.in: Regenerate.
-	* include/private/gcconfig.h: Enable MPROTECT_VDB for all Darwin
-	targets. Remove comments. Prepare ppc64 support for Darwin.
-
-2007-04-23  Keith Seitz  <keiths@redhat.com>
-
-	* include/gc.h (GC_is_thread_suspended): Declare.
-	* pthread_stop_world.c (GC_is_thread_suspended): New function.
-
-2007-04-03  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.ac (NO_EXECUTE_PERMISSION): Set by default.
-	* configure: Rebuilt.
-
-2007-03-07  Alexandre Oliva  <aoliva@redhat.com>
-
-	* include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New.
-	(GC_register_finalizer_unreachable): Declare.
-	(GC_debug_register_finalizer_unreachable): Declare.
-	* finalize.c (GC_unreachable_finalize_mark_proc): New.
-	(GC_register_finalizer_unreachable): New.
-	(GC_finalize): Handle it.
-	* dbg_mlc.c (GC_debug_register_finalizer_unreachable): New.
-	(GC_debug_register_finalizer_no_order): Fix whitespace.
-
-2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
-
-	* Makefile.am: Add dummy install-pdf target.
-	* Makefile.in: Regenerate
-
-2007-02-05  Roman Zippel <zippel@linux-m68k.org>
-
-	* boehm-gc/include/private/gcconfig.h: use LINUX_STACKBOTTOM so
-	it works with Linux 2.6, reactivate MPROTECT_VDB
-	* boehm-gc/pthread_stop_world.c: save all register
-	on signal entry
-
-2007-01-24  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* os_dep.c (defined(MPROTECT_VDB) && defined(DARWIN)): Moved recently
-	added defines to include/private/gc_priv.h
-	(catch_exception_raise): Added THREAD_FLD in exc_state for POWERPC too.
-	* darwin_stop_world.c: Removed the above defines.
-	* include/private/gc_priv.h: Moved definitions from darwin_stop_world.c
-	and os_dep.c to here. Fixed THREAD definition fixes for ppc64.
-
-2007-01-17  David Daney  <ddaney@avtrex.com>
-
-	* configure.ac: Don't define NO_SIGSET and NO_DEBUGGING while
-	cross-compiling.
-	* configure: Regenerated.
-	* include/gc_config.h.in: Regenerated.
-
-2007-01-17  Mike Stump  <mrs@apple.com>
-
-	* os_dep.c: Fix i686-apple-darwin9 builds.
-
-2007-01-16  Jack Howarth  <howarth@bromo.med.uc.edu>
-
-	* aclocal.m4: Regenerate to use multi.m4.
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2007-01-17  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* include/gc_config.h.in: Regenerate.
-
-2007-01-16  Petr Salinger  <Petr.Salinger@seznam.cz>
-
-	* include/private/gcconfig.h: Handle amd64/x86-64 cpu under
-	 GNU/kFreeBSD.
-	* os_dep.c: Likewise.
-
-2007-01-15  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* os_dep.c (defined(MPROTECT_VDB) && defined(DARWIN)): Adjust mail
-	reference.
-	(catch_exception_raise): Fix typo in the I386 exc_state.
-
-2007-01-11  Andreas Tobler  <a.tobler@schweiz.org>
-
-	* configure.ac: Replaced HAS_I386_THREAD_STATE_* with
-	HAS_X86_THREAD_STATE32_* and HAS_X86_THREAD_STATE64_* respectively.
-	* configure: Regenerated.
-	* include/private/gcconfig.h (DARWIN): Added X86_64 define for Darwin.
-	Added base definitions for the X86_64 Darwin port.
-	* include/private/gc_priv.h: Added definitions for Darwin MACH thread
-	operations. Moved existing THREAD_STATE info from darwin_stop_world.c.
-	* darwin_stop_world.c: Removed THREAD_STATE info. Added
-	HAS_X86_THREAD_STATE64___RAX. And replaced HAS_I386_THREAD_STATE___EAX
-	with HAS_X86_THREAD_STATE32___EAX.
-	(GC_push_all_stacks): Use GC_MACH_THREAD_STATE_COUNT. Add code for
-	X86_64 Darwin.
-	* dyn_load.c (GC_dyld_name_for_hdr): Use GC_MACH_HEADER.
-	(GC_dyld_image_add): Use GC_MACH_HEADER and GC_MACH_SECTION.
-	Distinguish between getsectbynamefromheader_64 and
-	getsectbynamefromheader.
-	(GC_dyld_image_remove): Likewise.
-	* os_dep.c (GC_dirty_init): Use GC_MACH_THREAD_STATE.
-	(catch_exception_raise): Introduce exception information for I386 and
-	X86_64 Darwin. Add X86_64 for exc_state.faultvaddr.
-
-2006-12-08  Mike Stump  <mrs@apple.com>
-
-	* configure.ac: Fix x86 darwin builds.
-	* darwin_stop_world.c: Likewise.
-	* include/private/gcconfig.h: Likewise.
-	* connfigure: Regenerate.
-	
-2006-09-26  Jack Howarth  <howarth@bromo.med.uc.edu>
-
-	PR target/29180
-	* darwin_stop_world.c: Make stack_start unsigned long.
-
-2006-09-21  Sandro Tolaini  <tolaini@libero.it>
-
-	* os_dep.c: Port to Darwin/i386
-	* darwin_stop_world.c: Likewise
-	* include/private/gcconfig.h: Likewise
-	
-2006-06-07  Petr Salinger  <Petr.Salinger@seznam.cz>
-
-	* configure.ac: add support for GNU/kFreeBSD, accepted by upstream
-	for gc 6.8.
-	* dyn_load.c: Likewise.
-	* include/gc.h: Likewise.
-	* private/gcconfig.h: Likewise.
-	* configure: Regenerate.
-	* include/gc_config.h.in: Regenerate.
-
-2006-09-14  Tom Tromey  <tromey@redhat.com>
-
-	PR boehm-gc/29068.
-	* misc.c (GC_init_inner): Don't use GC_get_thread_stack_base on
-	Solaris.
-
-2006-08-21  Bryce McKinlay  <mckinlay@redhat.com>
-	
-	PR libgcj/13212:
-	* configure.ac: Check for pthread_getattr_np(). Remove
-	GC_PTHREAD_SYM_VERSION detection.
-	* include/gc.h (GC_register_my_thread, GC_unregister_my_thread,
-	GC_get_thread_stack_base): New declarations.
-	* pthread_support.c (GC_register_my_thread, GC_unregister_my_thread,
-	GC_get_thread_stack_base): New functions.
-	(GC_delete_thread): Don't try to free the first_thread.
-	* misc.c (GC_init_inner): Use GC_get_thread_stack_base() if possible.
-	(pthread_create_, constr): Removed.
-	(pthread_create): Don't rename.
-	* include/gc_ext_config.h.in: Rebuilt.
-	* include/gc_pthread_redirects.h (pthread_create): Define 
-	unconditionally.
-	* include/gc_config.h.in: Rebuilt.
-	* configure: Rebuilt.
-
-2006-06-21  Keith Seitz  <keiths@redhat.com>
-
-	* pthread_stop_world.c (GC_suspend_handler): Redirect to suspension
-	routine if signal is received and thread is flagged SUSPENDED.
-	(suspend_self): New function.
-	(GC_suspend_thread): New function.
-	(GC_resume_thread): New function.
-	* include/gc.h (GC_suspend_thread): Declare.
-	(GC_resumet_thread): Declare.
-	* include/private/pthread_support.h (SUSPENDED): New GC_thread
-	flag.
-
-2006-06-20  Ranjit Mathew  <rmathew@gcc.gnu.org>
-	
-	Backport Windows 9x/ME VirtualQuery() fix from GC 6.7.
-	* os_dep.c (GC_wnt): Define.
-	(GC_init_win32): Set GC_wnt.
-	* dyn_load.c (GC_register_dynamic_libraries): Consider MEM_PRIVATE
-	sections also on Windows 9x/ME.
-
-2006-06-02  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.ac: Define HAS_PPC_THREAD_STATE_R0,
-	HAS_PPC_THREAD_STATE___R0, HAS_PPC_THREAD_STATE64_R0,
-	HAS_PPC_THREAD_STATE64___R0, HAS_I386_THREAD_STATE_EAX,
-	HAS_I386_THREAD_STATE___EAX.
-	* configure: Regenerate.
-	* include/gc_config.h.in: Regenerate.
-	* darwin_stop_world.c (PPC_RED_ZONE_SIZE): Use standard Darwin
-	macro names to determine value.
-	(THREAD_STATE): New.
-	(THREAD_FLD): New.
-	(GC_push_all_stacks): Use THREAD_STATE and THREAD_FLD in both versions.
-
-2006-05-24  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* Makefile.am: Add install-html target. 
-	* Makefile.in: Regenerate.
-	* aclocal.m4: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2006-03-07  Andrew Haley  <aph@redhat.com>
-
-	* dyn_load.c (GC_has_static_roots): Declare.
-	(GC_register_dynlib_callback): Call GC_has_static_roots.
-
-2006-04-11  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* darwin_stop_world.c (GC_push_all_stacks, GC_stop_world,
-	GC_start_world): Call vm_deallocate to free act_list. Fix from
-	Bruce Mitchener.
-
-2006-03-24  Andreas Tobler  <a.tobler@schweiz.ch>
-	John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-
-	* configure.ac (THREADS): Add REENTRANT for *-*-hpux11*.
-	Warn about POSIX threads not being supported for *-*-hpux10*.
-	* configure: Regenerate.
-
-2006-02-09  Tom Tromey  <tromey@redhat.com>
-
-	* pthread_support.c: Conditionally include dlfcn.h.
-
-2006-02-06  Jakub Jelinek  <jakub@redhat.com>
-	    Anthony Green  <green@redhat.com>
-	    Tom Tromey  <tromey@redhat.com>
-
-	* include/gc_ext_config.h.in: Added GC_PTHREAD_SYM_VERSION.
-	* include/gc_config.h.in: Rebuilt.
-	* include/gc_pthread_redirects.h (pthread_create): Conditionally
-	define.
-	* pthread_support.c (pthread_create_): New global.
-	(constr): New function.
-	(pthread_create): Conditionally renamed.
-	* configure: Rebuilt.
-	* configure.ac (GC_PTHREAD_SYM_VERSION): Define.
-
-2006-02-04  Alan Modra  <amodra@bigpond.net.au>
-
-	* include/private/gc_locks.h (GC_test_and_set <POWERPC>): Don't
-	use broken 64-bit version.
-
-2006-01-25  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* darwin_stop_world.c: Change inline asm instruction to ld as ldz
-	is wrong.
-
-	* Makefile.am (asm_libgcjgc_sources): Rename to asm_libgcjgc_sources.
-	* Makefile.in: Regenerate.
-
-2006-01-25  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* include/private/gcconfig.h: Revert to GC 6.6 version, removing
-	all local changes.
-
-2006-01-24  Bryce McKinlay  <mckinlay@redhat.com>
-
-	Import Boehm GC version 6.6.
-
-2006-01-24  David Ayers  <d.ayers@inode.at>
-
-	PR libobjc/13946
-	* include/gc.h: Fix prototype declarations for bootstrap.
-
-2005-11-01  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* include/private/gc_priv.h: Increase MAX_ROOT_SETS to 1024.
-
-2005-09-15  Kazu Hirata  <kazu@codesourcery.com>
-
-	* include/private/gc_locks.h (GC_test_and_set): Change the
-	constraint of the first operand to '0'.
-
-2005-09-06  Tom Tromey  <tromey@redhat.com>
-
-	PR libgcj/23662:
-	* include/private/gcconfig.h (LINUX_STACKBOTTOM): Use instead of
-	HEURISTIC1 on ARM.
-
-2005-07-17  SUGIOKA Toshinobu  <sugioka@itonet.co.jp>
-
-	* include/private/gcconfig.h (sh-linux): Use LINUX_STACKBOTTOM.
-
-2005-06-15  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* os_dep.c: Add FreeBSD/PowerPC bits.
-	(GC_SysVGetDataStart): Likewise.
-	* include/private/gcconfig.h: Likewise.
-
-2005-05-25  Andrew Haley  <aph@redhat.com>
-
-	* include/private/gcconfig.h (HBLKSIZE): Define to 4096 on
-	powerpc64-linux.
-
-2005-05-09  Mike Stump  <mrs@apple.com>
-
-	* configure: Regenerate.
-
-2005-04-19  Hans-Peter Nilsson  <hp@axis.com>
-
-	* os_dep.c, include/private/gc_locks.h: Import CRIS port by
-	Simon Posnjak from gc6.4.
-	* include/private/gcconfig.h: Ditto.  Add M32R note from gc6.4.
-
-2005-04-17  David S. Miller  <davem@davemloft.net>
-
-	* include/private/gcconfig.h (sparc-linux): Use LINUX_STACKBOTTOM.
-	* os_dep.c (GC_linux_stack_base): Check for bug present in some
-	Sparc glibc variants where __libc_stack_end is erroneously set
-	to "1".  Fallback to procfs code in that case.
-
-2005-04-12  Mike Stump  <mrs@apple.com>
-
-	* configure: Regenerate.
-
-2005-04-12  Richard Henderson  <rth@redhat.com>
-
-	* include/private/gcconfig.h (alpha-linux): Use LINUX_STACKBOTTOM.
-
-2005-03-23  Mike Stump  <mrs@apple.com>
-
-	* darwin_stop_world.c: Update for -m64 multilib.
-	* include/private/gcconfig.h: Likewise.
-	* powerpc_darwin_mach_dep.s: Likewise.
-
-2005-03-01  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* Makefile.in, include/Makefile.in: Regenerate.
-
-2005-02-26  Richard Earnshaw  <rearnsha@arm.com>
-
-	* dyn_load.c: On NetBSD, include machine/elf_machdep.h and define
-	ELFSIZE in terms of ARCH_ELFSIZE (back-ported from gc7.0alpha1).
-
-2005-02-15  Bryce McKinlay  <mckinlay@redhat.com>
-
-	PR libgcj/19823
-	* configure.host: Set gc_use_mmap on *-linux*.
-	* configure.ac: Define USE_MMAP if gc_use_mmap is set.
-	* include/private/gc_priv.h: Include gc_config.h.
-	* configure, include/gc_config.h.in: Rebuilt.
-
-2005-02-07  Hans Boehm  <Hans.Boehm@hp.com>
-
-	* allchblk.c (GC_allochblk_nth): Dont overlook available space if
-	  GC disabled, correctly convert GC_finalizer_mem_freed to byte,
-	  total_size to words.
-	* dyn_load.c (win32 GC_register_dynamic_libraries): Consider only
-	  MEM_IMAGE regions.
-	* mach_dep.c (GC_with_callee_saves_pushed): separate into new function,
-	  and indent appropriately.
-	* mark_rts.c (GC_approx_sp): Access stack.
-	* pthread_stop_world.c: (GC_suspend_handler): Explicitly push
-	  callee-saves registers when appropriate.
-	  (GC_stop_world): Handle EINTR from sem_wait (sync with Mono GC).
-
-2005-01-01  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* configure.ac (AC_CONFIG_HEADERS): Build both include/gc_config.h 
-	and include/gc_ext_config.h.
-	* include/gc_ext_config.h: New file. Define only THREAD_LOCAL_ALLOC.
-	* include/gc.h: Undef PACKAGE_* before including gc_config.h.
-
-2004-12-13  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure: Regenerate.
-
-2004-11-29  Bryce McKinlay  <mckinlay@redhat.com>
-
-	PR libgcj/18699
-	Revert patches of 2004-11-26 and 2004-11-27.
-
-2004-11-29  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure: Regenerate for libtool change.
-
-2004-11-27  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* include/gc_config.h.in: Add comment. Define only THREAD_LOCAL_ALLOC.
-
-2004-11-26  Bryce McKinlay  <mckinlay@redhat.com>
-
-	Fix "PACKAGE_NAME redefined" errors.
-	* configure.ac (AC_CONFIG_HEADERS): Build both include/config.h 
-	and include/gc_config.h.
-	* configure: Regenerated.
-	* include/gc_config.h.in: No longer auto-generated. Define only the
-	macros needed by libjava.
-	* include/config.h.in: Generated by autoheader.
-	* include/gc.h: Include config.h, not gc_config.h.
-
-2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure: Regenerate for libtool reversion.
-
-2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure: Regenerate for libtool change.
-
-2004-11-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
-
-	* configure.ac (machdep): Use sparc_mach_dep.lo on
-	sparc64-sun-solaris2.* too.
-	(Solaris gcc optimization fix): Disable on sparc*-sun-solaris2.*.
-	* configure: Regenerate.
-
-2004-11-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
-
-	PR target/18444
-	* configure.ac (threading): Accept 'posix95'.
-	* configure: Regenerate.
-
-2004-11-04  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* Makefile.am: Define ACLOCAL_AMFLAGS.
-	* configure.ac: Remove redundant sinclude.
-	* acinclude.m4: Delete file.
-	* aclocal.m4: Regenerate.
-	* Makefile.in, include/Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2004-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* include/private/gc_priv.h (GC_generic_malloc_words_small_inner):
-	Add prototype.
-
-2004-10-13  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
-
-	* include/private/gcconfig.h: Add m32r-linux target.
-
-2004-09-27  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure.ac: Update all AC_DEFINEs to newer style.
-	* configure: Regenerate.
-	* include/gc_config.h.in: Regenerate.
-
-2004-08-27  Hans Boehm  <Hans.Boehm@hp.com>
-
-	* backgraph.c, gc_priv.h (GC_traverse_back_graph,
-	GC_print_back_graph_stats): split GC_traverse_back_graph.
-	* backgraph.c: Dynamically grow in_progress_space.
-	* finalize.c (GC_notify_or_invoke_finalizers): also call
-	GC_print_back_graph_stats.
-	* alloc.c, finalize.c, gc_priv.h (GC_generate_random_backtrace_no_gc,
-	GC_print_back_height): Move delarations to header file.
-	* configure.ac: rename --enable-full-debug to --enable-gc-debug.
-	* configure: Regenerate.
-	
-2004-08-23  Hans Boehm  <Hans.Boehm@hp.com>
-
-	* aix_irix_threads.c: Move _THREADS checks after gc_priv.h include.
-	* backgraph.c, include/private/gc_pmark.h: Always include gc.h.
-
-2004-08-23  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* win32_threads.c: Move GC_WIN32_THREADS check after gc_priv.h include.
-	Reported by Danny Smith.
-
-2004-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* misc.c (GC_init): Replace lhs cast with rhs cast.
-
-2004-08-16  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* specific.c: Check GC_LINUX_THREADS before including 
-	private/specific.h. From Richard Earnshaw.
-
-2004-08-16  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* aclocal.m4: Remove obsolete construct for old automake.
-	* acinclude.m4: Regenerate with aclocal 1.9.1.
-	* configure.ac:  Remove duplicate AC_WITH calls.  Replace
-	AC_CANONICAL_SYSTEM with AC_CANONICAL_HOST, AC_CANONICAL_TARGET.
-	Replace _GCC_TOPLEV_NONCANONICAL calls with ACX_NONCANONICAL_TARGET.
-	Remove now-redundant subst of target_noncanonical.  Remove
-	now-gratuitous m4 quoting around $.  Replace AM_PROG_LIBTOOL with
-	AC_PROG_LIBTOOL and remove second, redundant AC_PROG_LIBTOOL.
-	Use slightly more modern form of AC_INIT.
-	* configure: Rebuild with autoconf 2.59.
-	* Makefile.in, include/Makefile.in: Rebuild with automake 1.9.1.
-
-2004-08-16  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* solaris_threads.c: Remove ifdef around #include "private/gc_priv.h"
-	since they're not known at this time.
-	* solaris_pthreads.c: Likewise.
-
-2004-08-15  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	PR target/14931
-	* powerpc_darwin_mach_dep.s (_GC_push_regs): Change to new stub style.
-
-2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>
-
-	* configure.ac (gc_cflags): Add -Iinclude.
-	(AC_CONFIG_HEADERS): New. Configure gc_config.h header.
-	Don't write DEFS to boehm-cflags file.
-	* configure: Rebuilt.
-	* gcj_mlc.c: Check #ifdef GC_GCJ_SUPPORT after including headers.
-	* specific.c: Check #ifdef GC_LINUX_THREADS after including headers.
-	* include/gc_config_macros.h: Remove backward-compatibility 
-	redefinitions of GC_ names.
-	* include/gc.h: Include <gc_config.h>.
-
-2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>
-
-	Import Boehm GC version 6.3.
-
-2004-08-12  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* include/Makefile.in: Regenerate
-
-2004-07-06  Andrew Pinski  <apinski@apple.com>
-
-	* os-dep.c (GC_task_self): Declare as static
-	and remove the second declaration.
-
-2004-06-20  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* Makefile.am: Add rule for .S files to fix bootstrap on
-	solaris and alpha.
-	* Makefile.in: Regenerate.
-
-2004-06-16  Paolo Bonzini  <bonzini@gnu.org>
-
-	* boehm-gc/configure.ac: New name of configure.in.
-	Remove useless multilib stuff.  Change uses of
-	INCLUDES and CXXINCLUDES to AM_CPPFLAGS.
-	* boehm-gc/configure.in: New name of configure.in.
-	* boehm-gc/Makefile.am: Update for automake 1.8.5.
-	* boehm-gc/acinclude.m4: Include ../config/acx.m4.
-	* boehm-gc/aclocal.m4: Regenerate.
-	* boehm-gc/configure: Regenerate.
-	* boehm-gc/Makefile.in: Regenerate.
-
-2004-06-15  Paolo Bonzini  <bonzini@gnu.org>
-
-	* .cvsignore: New file.
-
-2004-04-25  Andreas Jaeger  <aj@suse.de>
-
-	* mark.c (GC_mark_from): Use pointer as prefetch argument.
-
-2004-04-06  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* include/private/gcconfig.h (PREFETCH): Use __builtin_prefetch
-	for gcc >= 3.0.
-	(PREFETCH_FOR_WRITE): Likewise.
-
-2004-03-10  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure.ac: Bump AC_PREREQ to 2.59.
-	* configure: Regenerate.
-	* config.in: Regenerate.
-
-2004-02-26  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* ltconfig, ltmain.sh: Remove unused files.
-	* configure.in: Remove bogus extra early invocation of
-	AC_CONFIG_AUX_DIR.
-	* configure: Regenerate.
-	* mkinstalldirs, install-sh, config.sub, config.guess:
-	Remove (now) unused files.
-	* Makefile.in: Regenerate (losing references to vanished
-	files).
-
-	* configure.in: Add CCAS, CCASFLAGS for future automakes.
-	* configure, Makefile.in, include/Makefile.in: Regenerate.
-
-	* Makefile.am: Remove bogus duplicate setting of AM_CFLAGS.
-	* Makefile.in: Regenerate.
-
-	* configure.in: Remove bogus duplicate invocation of
-	AM_MAINTAINER_MODE.  Remove obsolete comment.
-	* configure: Regenerate.
-
-	* acinclude.m4: Remove GC_CONFIGURE macro; move contents
-	to configure.in.
-	* aclocal.m4: Regenerate.
-	* configure.in: Receive contents of GC_CONFIGURE macro.
-	* configure: Regenerate.
-
-	* configure.in: Remove more obsolete, bogus code.
-	* configure: Regenerate.
-
-	* acinclude.m4: Remove obsolete and bogus constructs.
-	* aclocal.m4: Regenerate.
-	* configure: Regnerate.
-
-2004-02-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* acinclude.m4: De-precious CC and CXX so that the right flags
-	are passed down to multilibs.
-	* aclocal.m4: Regenerate.
-	* configure: Regenerate.
-
-2004-02-22  Zack Weinberg <zack@codesourcery.com>
-	    Nathanael Nerode <neroden@twcny.rr.com>
-	    Alexandre Oliva <aoliva@redhat.com>
-
-	* config.sub, config.guess: Replace with forwarding scripts
-	which invoke the master copies in the top level.
-
-2004-02-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* acinclude.m4: Remove old no-executables workaround;
-	add new no-executables workaround.
-	* aclocal.m4: Regenerate.
-	* configure.in: Change prereqs to autoconf 2.57.
-	* configure: Regenerate with autoconf 2.57.
-
-	* configure.in: Use NCN_TARGET_NONCANONICAL and friends.
-	* configure: Regenerate.
-	* Makefile.am: Use target_noncanonical variable from configure.
-	* Makefile.in: Regenerate.
-	* include/Makefile.in: Regenerate.
-
-2004-02-20  Andrew Cagney  <cagney@redhat.com>
-
-	* config.guess: Update from version 2002-01-10 to 2004-02-16.
-	* config.sub: Update from version 2002-01-02 to 2004-02-16.
-
-2004-02-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* acinclude.m4: Remove bogus duplicate call to AC_CANONICAL_BUILD.
-	* aclocal.m4: Rebuild.
-	* configure: Regenerate.
-
-	* acinclude.m4: Move certain code to configure.in.
-	* configure.in: Receive code from acinclude.m4.
-	* aclocal.m4: Rebuild.
-	* configure: Regenerate.
-
-	* Makefile.direct, alloc.c: Resync to upstream 6.3 alpha 1.
-
-2004-01-20  Andrew Haley  <aph@redhat.com>
-
-	* include/private/gcconfig.h (USE_MMAP): Define for all Linux.
-
-	* configure.in: Comment change.
-
-2004-01-16  Andrew Haley  <aph@redhat.com>
-
-	* configure.in (NO_EXECUTE_PERMISSION): Remove global declaration;
-	add for ia64; remove for MIPS.
-	* configure: Regnerated.
-
-2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure.in: Add in AC_PREREQ(2.13)
-
-2004-01-07  Dave Jones <davej@redhat.com>
-
-	* malloc.c (GC_generic_malloc): Correct initialization typo.
-	* mallocx.c (GC_generic_malloc_ignore_off_page): Ditto.
-
-2003-10-31  Richard Earnshaw  <rearnsha@arm.com>
-
-	* include/private/gcconfig.h: Re-install change of 2003-04-16.
-
-2003-10-20  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* mips_sgi_mach_dep.s: Use _ABIO32 instead of external
-	_MIPS_SIM_ABI32.
-
-2003-10-18  Alan Modra  <amodra@bigpond.net.au>
-
-	* include/private/gcconfig.h (ALIGNMENT <powerpc linux>): Remove
-	unsure comment.
-
-2003-10-03  Jeff Sturm  <jsturm@one-point.com>
-
-	* configure: Rebuild.
-
-2003-10-03  Hans Boehm  <Hans.Boehm@hp.com>
-
-	* configure.in: Remove NO_GETENV definition for win32.
-	* mach_dep.c (GC_generic_push_regs): Prevent tail call optimization.
-	* misc.c (GC_init_inner): Call GC_thr_init for win32.
-	  (GC_set_warn_proc): Add assertion.
-	* win32_threads.c: Import 6.3alpha2 version.
-	* include/private/gc_priv.h: Add support for EMPTY_GETENV_RESULTS.
-
-2003-09-29  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in: Remove wildcard from Solaris 8-9/Intel and Solaris
-	2.3/SPARC, there are no micro versions.
-	Treat Solaris 10 and up alike.
-	* configure: Regenerate.
-
-2003-09-22  Anthony Green  <green@redhat.com>
-
-	* os_dep.c: Fix GC_get_stack_base build problem for vanilla elf
-	"NOSYS" targets.
-
-2003-09-20    <green@redhat.com>
-
-	* include/private/gcconfig.h: Don't check for __XSCALE__.  Instead
-	check for __arm__ or __thumb__.
-
-2003-09-09  Alan Modra  <amodra@bigpond.net.au>
-
-	* configure: Regenerate.
-
-2003-08-07  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-	    Roger Sayle <roger@eyesopen.com>
-
-	* configure.in: Set INCLUDES to absolute path.
-	Save $INCLUDES in boehm-cflags, too.
-	Set INCLUDES so it's available to config.status.
-	* configure: Regenerate.
-
-2003-07-31  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/gc.h (GC_CreateThread): Declare with WINAPI
-	attribute.
-	* win32_threads.c (GC_CreateThread): Make definitions consistent
-	with declaration.  Cast &thread_table[i].handle to PHANDLE
-	in call to DuplicateHandle
-	(thread_start): Declare as static.
-
-2003-07-30  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* dyn_load.c: Define __private_extern__ to match Apple's system
-	header.
-
-2003-07-28  Loren J. Rittle  <ljrittle@acm.org>
-
-	* os_dep.c: Remove redundancy introduced in last merge.
-
-2003-07-28  Jeff Sturm  <jsturm@one-point.com>
-
-	Import GC 6.3alpha1.
-	* BCC_MAKEFILE: Merge with GC 6.3alpha1 release.
-	* ChangeLog: Likewise.
-	* Makefile.am: Likewise.
-	* Makefile.direct: Likewise.
-	* Makefile.dj: Likewise.
-	* allchblk.c: Likewise.
-	* alloc.c: Likewise.
-	* backgraph.c: Likewise.
-	* configure.host: Likewise.
-	* configure.in: Likewise.
-	* dbg_mlc.c: Likewise.
-	* dyn_load.c: Likewise.
-	* finalize.c: Likewise.
-	* gc_cpp.cc: Likewise.
-	* gc_dlopen.c: Likewise.
-	* gcj_mlc.c: Likewise.
-	* if_mach.c: Likewise.
-	* mach_dep.c: Likewise.
-	* malloc.c: Likewise.
-	* mallocx.c: Likewise.
-	* mark.c: Likewise.
-	* mark_rts.c: Likewise.
-	* misc.c: Likewise.
-	* os_dep.c: Likewise.
-	* ptr_chck.c: Likewise.
-	* reclaim.c: Likewise.
-	* solaris_pthreads.c: Likewise.
-	* solaris_threads.c: Likewise.
-	* sparc_mach_dep.S: Likewise.
-	* threadlibs.c: Likewise.
-	* typd_mlc.c: Likewise.
-	* version.h: Likewise.
-	* win32_threads.c: Likewise.
-	* Mac_files/MacOS_Test_config.h: Likewise.
-	* Mac_files/MacOS_config.h: Likewise.
-	* cord/cordbscs.c: Likewise.
-	* cord/cordprnt.c: Likewise.
-	* cord/de_win.c: Likewise.
-	* doc/README: Likewise.
-	* doc/README.MacOSX: Likewise.
-	* doc/README.changes: Likewise.
-	* doc/README.environment: Likewise.
-	* doc/README.ews4800: Likewise.
-	* doc/README.linux: Likewise.
-	* doc/README.macros: Likewise.
-	* doc/README.win32: Likewise.
-	* doc/debugging.html: Likewise.
-	* doc/gcdescr.html: Likewise.
-	* doc/tree.html: Likewise.
-	* include/Makefile.in: Likewise.
-	* include/gc.h: Likewise.
-	* include/gc_cpp.h: Likewise.
-	* include/gc_local_alloc.h: Likewise.
-	* include/gc_mark.h: Likewise.
-	* include/gc_pthread_redirects.h: Likewise.
-	* include/gc_typed.h: Likewise.
-	* include/new_gc_alloc.h: Likewise.
-	* include/private/dbg_mlc.h: Likewise.
-	* include/private/gc_hdrs.h: Likewise.
-	* include/private/gc_locks.h: Likewise.
-	* include/private/gc_pmark.h: Likewise.
-	* include/private/gc_priv.h: Likewise.
-	* include/private/gcconfig.h: Likewise.
-	* include/private/solaris_threads.h: Likewise.
-	* include/private/specific.h: Likewise.
-	* tests/test.c: Likewise.
-	* tests/test_cpp.cc: Likewise.
-
-	* configure: Rebuild.
-	* Makefile.in: Rebuild.
-
-	* mips_sgi_mach_dep.s: Add.
-
-	* alpha_mach_dep.s: Remove.
-	* irix_threads.c: Remove.
-	* linux_threads.c: Remove.
-	* mips_sgi_mach_dep.S: Remove.
-	* missing: Remove.
-	* powerpc_macosx_mach_dep.s: Remove.
-	* doc/Makefile.am: Remove.
-	* doc/Makefile.in: Remove.
-
-2003-07-25  Roger Sayle  <roger@eyesopen.com>
-
-	* configure.host: Only use +ESdbgasm when using the HPUX native
-	compiler on PA-Risc.  It isn't recognized by GCC and is silently
-	ignored by HP's compilers on ia64.
-
-2003-04-28  Mohan Embar  <gnustuff@thisiscool.com>
-
-	* configure.in: define GC_DLL under mingw if --enable-shared
-	* configure: rebuilt
-	* win32_threads.c: add #ifdef GC_DLL around DllMain
-
-2003-04-16  Richard Earnshaw  <rearnsha@arm.com>
-
-	* include/private/gcconfig.h: Add support for arm-netbsdelf.
-
-2003-04-09  Tom Tromey  <tromey@redhat.com>
-
-	* include/private/gcconfig.h (LINUX_STACKBOTTOM): Define for
-	POWERPC.
-	(STACK_GRAN, HEURISTIC1): Don't define for POWERPC.
-
-2003-03-22  Richard Henderson  <rth@redhat.com>
-
-	* include/private/gc_locks.h [IA64]: Include ia64intrin.h.
-	(GC_test_and_set): Use __sync_lock_test_and_set.
-	(GC_clear): Use volatile assignment.
-	(GC_compare_and_exchange): Use __sync_bool_compare_and_swap.
-	(GC_memory_write_barrier): Use __sync_synchronize.
-
-2003-03-12  Andreas Schwab  <schwab@suse.de>
-
-	* configure.in: Avoid trailing /. in toolexeclibdir.
-	* configure: Rebuilt.
-
-2003-03-04  Hans Boehm <Hans.Boehm@hp.com>
-	* include/private/gcconfig.h (GC_data_start): declare when needed.
-	* include/private/gc_priv.h: Include gcconfig.h after ptr_t
-	declaration.
-	* dyn_load.c (GC_register_dynamic_libraries_dl_iterate_phdr,
-	GC_register_dynlib_callback): Register main data for static
-	executable if dl_iterate_phdr() didn't.
-	* misc.c (GC_init_inner): Call GC_init_linux_data_start() even
-	if we don't expect to register main static data.
-
-2003-03-03  Hans Boehm  <Hans.Boehm@hp.com>
-	* mark_rts.c (GC_cond_register_dynamic_libraries): add.
-	(GC_push_roots): explicitly mark free list headers, register
-	dynamic libraries only if !REGISTER_LIBRARIES_EARLY.
-	* alloc.c (GC_stopped_mark): Conditionally call
-	GC_cond_register_dynamic_libraries().
-	(GC_collect_a_little_inner, GC_try_to_collect_inner): Check GC_dont_gc.
-	* dyn_load.c (GC_register_main_static_data): define.
-	(GC_register_dyn_libraries (Linux /proc, Linux ELF versions)):
-	no longer skip main data.
-	* misc.c (GC_REGISTER_MAIN_STATIC_DATA): define.
-	(GC_init_inner): Make main data registration conditional.
-	* include/private/gc_priv.h (GC_register_main_static_data): declare.
-	* include/private/gcconfig.h (REGISTER_LIBRARIES_EARLY): define
-	for LINUX.
-
-2003-02-20  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to
-	config.status.
-	* configure: Rebuilt.
-
-2003-02-11  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* include/private/gcconfig.h: undefine MPROTECT_VDB for MACOSX
-
-2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.
-	Remove USE_LIBDIR conditional.
-	* Makefile.am (toolexecdir, toolexeclibdir): Don't override.
-	* Makefile.in, configure: Rebuilt.
-
-2002-12-31  Tom Tromey  <tromey@redhat.com>
-
-	For PR libgcj/8933:
-	* include/Makefile.in: Rebuilt.
-	* include/Makefile.am (noinst_HEADERS): Renamed from
-	include_HEADERS.
-
-2002-11-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* ltconfig (osf[345]): Append $major to soname_spec.
-	Reflect this in library_names_spec.
-	* ltmain.sh (osf): Prefix $major with . for use as extension.
-
-2002-10-02  Andreas Jaeger  <aj@suse.de>
-
-	* include/private/gcconfig.h (HBLKSIZE): Define for x86-64.
-
-2002-09-28  Richard Earnshaw  <rearnsha@arm.com>
-
-	* include/private/gcconfig.h: Don't check for __XSCALE__.  Instead
-	check for __arm__ or __thumb__.
-
-2002-09-27  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* include/private/gcconfig: Add machine type S390.  Add s390x support.
-	* include/private/gc_locks.h (GC_test_and_set): Implement for s390.
-	(GC_compare_and_exchange): Likewise.
-
-2002-09-24  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* include/private/gcconfig.h: Fix NetBSD/mips parameters.
-
-2002-08-23  Adam Megacz <adam@xwt.org>
-
-	* win32_threads.cc: Removed extraneous ABORT()
-
-2002-09-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
-
-	* Makefile.am (all-multi): Fix multilib parallel build.
-
-2002-07-18  Bo Thorsen  <bo@suse.de>
-
-	* include/private/gcconfig.h: Add x86-64 definitions.
-	* os_dep.c: Add x86-64 support.
-	* configure.in: Likewise.
-	* configure: Regenerate.
-
-2002-07-18  H.J. Lu <hjl@gnu.org>
-
-	* mach_dep.c (GC_push_regs): Remove the unused Linux/mips code.
-
-2002-07-18  H.J. Lu  (hjl@gnu.org)
-
-	* configure.in (machdep): Don't add mips_sgi_mach_dep.lo for
-	Linux/mips.
-
-2002-06-28  Hans Boehm <Hans_Boehm@hp.com>
-	    Jonathan Clark
-
-	* win32_threads.c (GC_push_all_stacks): Tolerate bad sp.
-
-2002-06-09  H.J. Lu  (hjl@gnu.org)
-
-	* include/private/gc_locks.h (GC_test_and_set): Support
-	Linux/mips.
-	(GC_TEST_AND_SET_DEFINED): Likewise.
-
-	* include/private/gcconfig.h (DYNAMIC_LOADING): Defined for
-	Linux/mips.
-	(DATAEND): Likewise.
-	(LINUX_STACKBOTTOM): Likewise.
-	(STACKBOTTOM): Removed for Linux/mips.
-
-Sun May 19 11:32:03 2002  Mark P Mitchell  <mark@codesourcery.com>
-
-	* irix_threads.cc (GC_pthread_detach): Do not use REAL_FUNC.
-	(GC_pthread_create): Fix typo.
-	(GC_TRY_LOCK): Likewise.
-	* include/private/gc_locks.h (GC_test_and_set): Only take one
-	one argument.
-	(LOCK): Adjust appropriately.
-	* include/private/gc_priv.h (SIG_SUSPEND): Use SIGRTMIN if
-	_SIGRTMIN is unavailable.
-
-2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
-	* aclocal.m4: Regenerate.
-	* configure: Regenerate.
-
-2002-05-08  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at
-	script entry, and set LD to it when configuring multilibs.
-	* configure: Rebuilt.
-
-2002-04-22  Jeff Sturm  <jsturm@one-point.com>
-
-	* Makefile.am (toolexeclib_LTLIBRARIES): Remove.
-	(noinst_LTLIBRARIES): Add libgcjgc.la.
-
-	* Makefile.in: Rebuild.
-
-2002-04-22  David S. Miller  <davem@redhat.com>
-
-	* include/private/gcconfig.h: Hard-code STACKBOTTOM on
-	64-bit SPARC Linux, the __libc_stack_end technique does
-	not work in this case.
-
-2002-04-22  Jeff Sturm  <jsturm@one-point.com>
-
-	* gcconfig.h: Enable DYNAMIC_LOADING for all sparc-solaris ABIs.
-
-2002-04-17  Hans Boehm  <Hans_Boehm@hp.com>
-
-	* include/private/gcconfig.h: Use LINUX_STACKBOTTOM for
-	SPARC Linux.
-
-2002-04-09  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/private/gcconfig.h (DATAEND): Update comment example
-	to match reality.
-
-2002-04-08  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/private/gcconfig.h (DATAEND): Clarify comment.
-
-2002-04-08  Hans Boehm  <Hans_Boehm@hp.com>
-
-	* include/private/gc_priv.h (WARN macro): Add "GC warning:" prefix.
-	(GC_large_alloc_warn_interval, GC_large_alloc_warn_suppressed):
-	declare.
-	* allchblk.c (GC_allchblk_nth): Change text and support reduced
-	frequency for blacklist warning message.
-	* misc.c (GC_large_alloc_warn_interval,
-	GC_large_alloc_warn_suppressed): define.
-	(GC_init_inner): Check GC_NO_BLACKLIST_WARNING and
-	GC_LARGE_ALLOC_WARN_INTERVAL environment variables.
-	* doc/README.environment (GC_NO_BLACKLIST_WARNING): Deprecate.
-	(GC_LARGE_ALLOC_WARN_INTERVAL): Add documentation.
-
-	* dyn_load.c (_DYNAMIC): Move declaration to file scope.
-
-2002-04-04  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/private/gcconfig.h: Add support for an unmapped
-	memory hole between the end of the initialized data segment
-	and the start of the BSS on FreeBSD/i386.
-
-2002-03-30  Krister Walfridsson  <cato@df.lth.se>
-
-	* include/private/gcconfig.h: define DYNAMIC_LOADING for ELF
-	NetBSD/i386.
-
-2002-03-29  Hans Boehm  <Hans_Boehm@hp.com>
-
-	* linux_threads.c (return_free_lists): Clear fl[i] unconditionally.
-	(GC_local_gcj_malloc): Add assertion.
-	(start_mark_threads): Fix abort message.
-	* mark.c (GC_mark_from): Generalize assertion.
-	* reclaim.c (GC_clear_fl_links): New function.
-	(GC_start_reclaim): Must clear some freelist links.
-	* include/private/specific.h, specific.c: Add assertions.
-	Safer definition for INVALID_QTID, quick_thread_id.  Fix/add comments.
-	Rearrange tse fields.
-
-2002-03-27  Richard Henderson  <rth@redhat.com>
-
-	* os_dep.c (GC_init_linux_data_start): Fix references to
-	__data_start and _end.
-
-2002-03-25  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/private/gcconfig.h: Change all likely references
-	to linker script synthesized symbols to use this idiom:
-	extern int etext[]; etext
-
-2002-03-25  Jeff Sturm  <jsturm@one-point.com>
-
-	* linux_threads.c (GC_get_nprocs): Close file descriptor.
-
-2002-03-21  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/private/gcconfig.h: Add unified test for FreeBSD.
-	Support FreeBSD/alpha.
-	* os_dep.c: Do not include <machine/trap.h> unless available.
-	(GC_freebsd_stack_base): Fix types.
-
-2002-03-17  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* Makefile.am: Make a convenience library.
-	* Makefile.in: Rebuilt.
-
-2002-03-15  Anthony Green  <green@redhat.com>
-
-	* misc.c (GC_init_inner): Initialize GC_write_cs before use.
-	* configure.in: Disable use of getenv for win32 targets (some of
-	which have broken implementations).
-	* configure: Rebuilt.
-
-2002-03-12  Adam Megacz  <adam@xwt.org>
-
-	* dyn_load.c: Renamed GC_win32s to GC_no_win32_dlls.
-	* misc.c: Renamed GC_is_win32s() to GC_no_win32_dlls
-	* os_dep.c: Renamed GC_win32s to GC_no_win32_dlls and
-	statically initialized it to TRUE if compiling with GCC.
-	* win32_threads.c (thread_start): We no longer use SEH if
-	compiling with GCC.
-	* mark.c (GC_mark_some): We no longer use SEH if
-	compiling with GCC.
-
-2002-03-09  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* include/gc_priv.h: Define ALIGN_DOUBLE on 32 bit targets if GCJ
-	support is enabled, for hash synchronization.
-
-2002-02-24  Adam Megacz  <adam@xwt.org>
-
-	* Makefile.am: Added win32_threads.c to sources list.
-	* win32_threads.c: Added two */'s which I had neglected.
-
-2002-02-20  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* Makefile.am: Re-add SUBDIRS parameter which was lost in merge.
-	* Makefile.in: Rebuilt.
-
-2002-02-13  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* dbg_mlc.c (GC_debug_generic_malloc): Removed.
-
-	* sparc_mach_dep.S: Rename from sparc_mach_dep.s as it is a
-	preprocessor file.
-	* mips_sgi_mach_dep.S: Likewise.
-	* Makefile.am: Update for above changes.
-	* Makefile.in: Rebuilt.
-
-2002-02-12  Richard Henderson  <rth@redhat.com>
-
-	* configure.in: Re-apply 2001-06-26 configure change.
-	* configure: Rebuild.
-
-2002-02-12  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	Imported GC 6.1 Alpha 3.
-
-	* sparc_mach_dep.S: Delete incorrectly named file.
-
-2001-02-11  Adam Megacz <adam@xwt.org
-
-	* configure.in: support for win32, saner
-	cross-compile options
-
-2001-02-08  Anthony Green  <green@redhat.com>
-
-	* include/private/gcconfig.h: Add XSCALE NOSYS support for bare
-	  board embedded targets.
-	* os_dep.c: Avoid signal handling code for NOSYS/ECOS targets.
-	  Use GC_get_stack_base for NOSYS/ECOS targets.  Clean up some
-	  redundant uses of ECOS.
-	* misc.c: Use NOSYS where ECOS is being used.
-	  Don't define GC_write twice for ECOS systems.
-	  (GC_write): New function for NOSYS targets.
-
-2002-02-06  Adam Megacz <adam@xwt.org>
-
-	* boehm-gc/include/gc.h: (GC_CreateThread) This function is
-	now exposed on all Win32 platforms.
-	* boehm-gc/win32_threads.c: (GC_CreateThread) This now
-	compiles on Win32; it invokes CreateThread() if GC is built
-	as a DLL; otherwise it registers the thread.
-	* boehm-gc/misc.c (GC_init): Initialize GC_allocate_ml in case
-	libgcjgc was not built as a DLL.
-
-2002-02-01  Adam Megacz <adam@xwt.org>
-
-	* boehm-gc on win32 now automatically detects if it is being built
-	as a DLL; see http://gcc.gnu.org/ml/java/2001-12/msg00240.html
-
-2002-01-25  David Edelsohn  <edelsohn@gnu.org>
-
-	* include/gc.h (GC_INIT): Add DATASTART and DATAEND roots on AIX.
-	* include/private/gcconfig.h (RS6000): Add 64-bit AIX support.
-	Define USE_GENERIC_PUSH_REGS.  Use AIX _data and _end symbols for
-	DATASTART and DATAEND roots.
-	* rs6000_mach_dep.s: Add function descriptor and traceback table.
-
-2001-12-16  Jeff Sturm  <jsturm@one-point.com>
-
-	* dyn_load.c: Define ElfW (if needed) for all targets,
-	not just GNU/Linux.
-	(GC_FirstDLOpenedLinkMap): Use it.
-	(GC_register_dynamic_libraries_dl): Use it.
-	* include/private/gcconfig.h: Define CPP_WORDSZ, ELF_CLASS
-	for sparcv9.
-
-2001-12-16  Craig Rodrigues  <rodrigc@gcc.gnu.org>
-
-	PR other/3725
-	* configure.in: Add AC_SUBST(target_alias).
-	* configure: Regenerated.
-
-2001-11-26  Loren J. Rittle  <ljrittle@acm.org>
-
-	* linux_threads.c (WRAP_FUNC(pthread_join)): Remove special
-	case for GC_FREEBSD_THREADS.
-	* configure.in (*-*-freebsd*): Clarify warning.
-	* configure: Rebuilt.
-
-2001-10-23  Loren J. Rittle  <ljrittle@acm.org>
-	    Andreas Tobler <toa@pop.agri.ch>
-
-	* include/private/solaris_threads.h: Update to use GC_SOLARIS_THREADS.
-
-2001-10-22  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* linux_threads.c (GC_init_parallel): Do not declare as a static
-	constructor.
-	* include/gc.h (GC_init): Declare here. Add description.
-	* include/private/gc_priv.h (GC_init): Remove declaration.
-
-2001-10-16  Loren J. Rittle  <ljrittle@acm.org>
-
-	* include/gc_pthread_redirects.h: Generalize test to use GC_PTHREADS.
-	* linux_threads.c (WRAP_FUNC(pthread_join)): Conditionalized on
-	GC_FREEBSD_THREADS, handle strange interaction between system
-	pthread implementation and boehm-gc signal-handler architecture.
-	* tests/test.c (main): Conditionalized on GC_FREEBSD_THREADS,
-	set stack.
-	* include/private/gcconfig.h (configuration keyed off FREEBSD):
-	Define SIG_SUSPEND, SIG_THR_RESTART.  Do not define
-	MPROTECT_VDB when GC_FREEBSD_THREADS is defined.
-
-2001-10-16  Loren J. Rittle  <ljrittle@acm.org>
-
-	* Makefile.am (test.o): Find tests/test.c in $(srcdir).
-	* Makefile.in: Rebuilt.
-
-2001-10-16  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* Makefile.am, acinclude.m4, configure.in: Imported GC 6.1 Alpha 1 and
-	merged local changes.
-
-2001-09-26  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* solaris_threads.c (MAX_ORIG_STACK_SIZE) [I386]: Provide special
-	Solaris 2/Intel definition.
-
-	* configure.in (i?86-*-solaris2.[89]*): Define
-	SOLARIS25_PROC_VDB_BUG_FIXED.
-	* include/private/gcconfig.h [I386 && SUNOS5]: Use it.
-	* configure: Regenerate.
-
-	* include/private/gcconfig.h [I386 && SUNOS5] (DATASTART): Use _etext.
-	(DATAEND): Define using _end.
-
-2001-09-11  Per Bothner  <per@bothner.com>
-
-	* include/Makefile.am:  New file.  It defines include_HEADERS.
-	* Makefile.am (SUBDIRS):  New macro, set to include.
-	* configure.in (AC_OUTPUT):  Add include/Makefile.
-
-2001-08-20  Tom Tromey  <tromey@redhat.com>
-
-	* configure: Rebuilt.
-	* configure.in: Always ask gcc for threads package.
-
-2001-08-17  Tom Tromey  <tromey@redhat.com>
-
-	* Makefile.am, acinclude.m4, configure.in: Imported GC 6.0 and
-	merged local changes.
-
-2001-08-02  David Billinghurst <David.Billinghurst>
-
-	* configure: Rebuilt.
-	* configure.in:  POSIX threads on cygwin does not link with
-	-lpthreads.
-
-2001-07-03  Tom Tromey  <tromey@redhat.com>
-
-	Fix for PR bootstrap/3281:
-	* aclocal.m4, configure, Makefile.in: Rebuilt.
-	* acinclude.m4: Set mkinstalldirs for in-tree build.
-
-2001-06-26  Richard Henderson  <rth@redhat.com>
-
-	* alpha_mach_dep.s: Mark call-saved FP registers.
-	* include/private/gcconfig.h (ALPHA): Remove USE_GENERIC_PUSH_REGS.
-	* configure.in (alpha*): Re-enable alpha_mach_dep.s
-	* configure: Rebuild.
-
-2001-06-12  Tom Tromey  <tromey@redhat.com>
-
-	* aclocal.m4, configure: Rebuilt.
-	* acinclude.m4: Find configure.host in srcdir.
-
-2001-06-09  Alexandre Oliva  <aoliva@redhat.com>, Stephen L Moshier  <moshier@mediaone.net>
-
-	* configure.in (AC_EXEEXT): Work around in case it expands to
-	nothing, as in autoconf 2.50.
-	* acinclude.m4: Likewise.
-	* aclocal.m4, configure: Rebuilt.
-
-2001-06-07  Tom Tromey  <tromey@redhat.com>
-
-	For PR bootstrap/3075:
-	* configure, aclocal.m4, Makefile.in: Rebuilt.
-	* configure.in: Don't call AC_CONFIG_AUX_DIR or
-	AC_CANONICAL_SYSTEM.
-	* acinclude.m4 (BOEHM_CONFIGURE): Call AC_CONFIG_AUX_DIR and
-	AC_CANONICAL_SYSTEM here.
-	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
-	boehm_gc_basedir.
-
-2001-05-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	* Makefile.am: Override gctest_OBJECTS so tests/test.c can be built.
-	(libgcjgc_la_SOURCES): Remove typo.
-	* tests/test.c: Fix struct names and includes for GC_GCJ_SUPPORT case.
-	* Makefile.in: Rebuilt.
-
-2001-05-21  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
-
-	Imported version version 6.0alpha7.
-
-	* README, README.Mac, README.OS2, README.QUICK, README.alpha,
-	README.amiga, README.debugging, README.dj, README.hp, README.linux,
-	README.rs6000, README.sgi, README.solaris2, README.uts,
-	README.win32, SCoptions.amiga, backptr.h, barrett_diagram,
-	dbg_mlc.h, gc.h, gc.man, gc_alloc.h, gc_cpp.h, gc_hdrs.h, gc_mark.h,
-	gc_priv.h, gc_private.h, gc_typed.h, gcconfig.h,
-	hpux_irix_threads.c, makefile.depend, nursery.c,
-	solaris_threads.h, test.c, test_cpp.cc, weakpointer.h, cord/README,
-	cord/SCOPTIONS.amiga, cord/SMakefile.amiga, cord/cord.h,
-	cord/ec.h, cord/gc.h, cord/private/cord_pos.h, include/backptr.h,
-	include/gc_copy_descr.h, include/gc_nursery.h: Remove obsolete/moved
-	files.
-
-2001-05-19  Hans Boehm  <hans_boehm@hp.com>
-
-	* configure.host: Build with -fexceptions.
-	* linux_threads.c: Remember which thread stopped world for
-
-2001-05-04  Loren J. Rittle  <ljrittle@acm.org>
-	    with final tuning by Bryce McKinlay
-
-	* configure.in: Add support for --enable-threads=posix on FreeBSD.
-	* configure: Rebuilt.
-
-2001-05-01  Jeffrey Oldham  <oldham@codesourcery.com>
-
-	* gc_priv.h (UNLOCK): Change type of GC_noop1 argument.
-	(GC_noop1): Change declaration to take one argument.
-
-2001-04-26  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in: Obtain THREADS with `gcc -v'.
-	* configure: Rebuilt.
-
-2001-04-05  Hans Boehm  <hans_boehm@hp.com>
-
-	* misc.c: Back out buggy changes to stack clearing code.
-	Reduce CLEAR_SIZE to 1/4 of original value to reduce time
-	spent clearing memory.
-
-2001-04-04  Hans Boehm  <hans_boehm@hp.com>
-
-	* finalize.c:
-	- Accomodate finalization requests for static objects.
-	  (Will be required by hash synchronization.  May be needed
-	  in some configurations now.)
-
-	* gc_priv.h:
-	- Define MIN_WORDS.  All allocation requests are rounded
-	  up to at least this size.  Removes a subtle assumption that
-	  Java objects have a 2 word header.
-
-	* gcconfig.h:
-	- Adjust Linux/IA64 configuration for non-ancient kernels.
-	  (Necessary fix for IA64.)
-
-	* linux_threads.c:
-	- Fix syntax error in currently unused code.  Will be needed
-	  for Linux/PA-RISC.
-
-	* malloc.c:
-	- Handle MIN_WORDS.
-
-	* misc.c:
-	- Handle MIN_WORDS.
-	- Change stack cleaning code to typically clear about one tenth
-	  the memory it used to in the threads configuration.  Occasionally
-	  still clear more.  (This is really a fix for a long-standing
-	  and fairly significant performance bug with threads.)
-
-	* os_dep.c:
-	- Fix the code for finding the beginning of the data segment under
-	  Linux.  I believe this is necessary for some IA64 Linux
-	  distributions.  It will also helo other platforms, though those
-	  may additionally require a gcconfig.h adjustment.  (This basically
-	  works around the absence of a data_start or __data_start
-	  definition in glibc.)
-
-	* test.c:
-	- Handle rounding due to MIN_WORDS.
-
-2001-03-22  Tom Tromey  <tromey@redhat.com>
-
-	* Makefile.am (gctest_LDFLAGS): Use -shared-libgcc.
-
-2001-03-19  Tom Tromey  <tromey@redhat.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (gctest_LDFLAGS): new macro.
-
-2001-03-16  Tom Tromey  <tromey@redhat.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (TESTS_ENVIRONMENT): New macro.
-
-2001-01-23  Rod Stewart <stewart@lab43.org>
-
-	* gcconfig.h: Check for `__arm__', not `arm'.
-
-2000-12-30  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* configure.in: Rename THREADLIB to THREADLIBS.
-	* Makefile.am (LINK): Add $(THREADLIBS) to libtool command line. This
-	ensures that we link the correct version of the linuxthreads semaphore
-	functions.
-	* Makefile.in: Rebuilt.
-	* configure: Rebuilt.
-
-	* linux_thread.c (GC_thr_init, GC_suspend_handler): Add SIGABRT to the
-	list of signals which are not blocked during suspend in the NO_SIGNALS
-	case.
-
-2000-12-23  Hans Boehm  <Hans_Boehm@hp.com>
-
-	* gcj_mlc.c (GC_gcj_malloc): Don't release allocation lock twice.
-
-2000-12-15  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* Makefile.dist: Renamed from Makefile.orig.
-
-2000-12-11  Alexandre Petit-Bianco  <apbianco@cygnus.com>
-
-	* Makefile.am (gctest_LDADD): Added EXTRA_TEST_LIBS.
-	* configure.in (EXTRA_TEST_LIBS): Check for `dlopen' in -ldl and
-	set accordingly.
-	* Makefile.in: Rebuilt.
-	* configure: Likewise.
-
-2000-12-10  Geoffrey Keating  <geoffk@redhat.com>
-
-	* gcconfig.h: Add new case for powerpc EABI.
-	[PPC]: Handle embedded OS for powerpc simulator.
-
-2000-09-30  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* configure.in: Define GC_GCJ_SUPPORT. Define NO_DEBUGGING in
-	cross-compile configuration only.
-	* Makefile.am: Build gcj_mlc.c.
-	* configure, Makefile.in: Rebuilt.
-
-2000-09-10  Alexandre Oliva  <aoliva@redhat.com>
-
-	* acinclude.m4: Include libtool macros from the top level.
-	* aclocal.m4, configure: Rebuilt.
-
-2000-09-04  Anthony Green  <green@redhat.com>
-
-	Fix for PR libgcj/230:
-	* mark.c (GC_mark_from_mark_stack): Remove call to
-	GC_debug_object_start.
-	* gc_priv.h (GC_debug_object_start): Remove prototype.
-
-2000-08-16  Alexandre Oliva  <aoliva@redhat.com>
-
-	* gcconfig.h [OSF1] (_end): Declare as `int'.
-
-2000-08-02  Tom Tromey  <tromey@cygnus.com>
-
-	* gc_priv.h (GC_generic_malloc_inner): Prototype.
-	(GC_generic_malloc): Likewise.
-	(GC_add_to_black_list_normal): Likewise.
-	(GC_find_header): Likewise.
-	(GC_ADD_TO_BLACK_LIST_NORMAL): Cast bits argument to word.
-	* gc_mark.h (GC_find_start): Prototype.
-	(GC_signal_mark_stack_overflow): Likewise.
-
-2000-07-24  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (THREADS): Don't --enable-threads on IRIX <= 5.*.
-	* configure: Rebuilt.
-
-	* dyn_load.c (GC_scratch_last_end_ptr): Don't declare a #define.
-
-2000-06-20  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	Imported version 5.1.
-	* acinclude.m4: Push version to 5.1.
-
-2000-06-19  Andrew Haley  <aph@cygnus.com>
-
-	* os_dep.c (read): Pass two dummy args to syscall().
-
-2000-05-11  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	Imported 5.0 release version.
-	* acinclude.m4: Increment version to 5.0.
-
-2000-05-07  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	Imported version 5.0alpha7.
-	* acinclude.m4: Update version to 5.0a7.
-
-2000-04-26  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcconfig.h (SPARC): Define ALIGNMENT to 8 for 64bit SPARC.
-	(SPARC/LINUX): Use GC_SysVGetDataStart instead of LINUX_DATA_START
-	- sparc glibc does not provide it.
-	(SAVE_CALL_CHAIN, ASM_CLEAR_CODE): Define on sparc*-linux*.
-	Make STACKBOTTOM depend on the wordsize.
-	* os_dep.c (GC_SysVGetDataStart): Compile in on sparc*-linux*.
-	(struct frame): Declare on sparc*-linux*.
-	(GC_save_callers): Bias the frame pointers if needed (sparc64).
-	* mach_dep.c (GC_save_regs_in_stack): Optimize on sparc32.
-	Implement on sparc64.
-	(GC_clear_stack_inner): Implement on sparc64.
-	* gc_priv.h (GC_test_and_set): Implement for sparc.
-	* linux_threads.c (GC_suspend_handler, GC_push_all_stacks): Use
-	GC_save_regs_in_stack on sparc.
-
-2000-04-23  Tom Tromey  <tromey@cygnus.com>
-
-	* gcconfig.h (DYNAMIC_LOADING): Define for PPC Linux.
-
-2000-04-19  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	Imported version version 5.0alpha6.
-	* acinclude.m4: Bump version to 5.0a6.
-	* configure.in: Don't use alpha_mach_dep.s.
-	* include/private/config.h, irix_threads.c gc_watcom.asm: Delete
-	obsolete files.
-	* Makefile.am, Makefile.in: irix_threads.c is now
-	hpux_irix_threads.c.
-	* Makefile.orig: Updated from gc distribution Makefile.
-
-2000-03-26  Anthony Green  <green@redhat.com>
-
-	* misc.c (GC_enable): Always define GC_enable and GC_disable.
-
-2000-02-14  Tom Tromey  <tromey@cygnus.com>
-
-	* gc.h (dlopen): Define as GC_dlopen on Linux.
-	(GC_dlopen): Declare on Linux.
-	* dyn_load.c (GC_dlopen): Define for Linux.
-
-Fri Jan 28 17:13:20 2000  Anthony Green  <green@cygnus.com>
-
-	* gcconfig.h (DATASTART): Add missing extern declaration
-	for data_start on powerpc.
-
-1999-12-22  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* linux_threads.c: Don't block SIGINT, SIGQUIT, SIGTERM in the
-	NO_SIGNALS case.
-
-1999-12-19  Jeff Sturm  <jsturm@sigma6.com>
-
-	* gcconfig.h: Define DATASTART for Alpha Linux.
-
-1999-12-19  Anthony Green  <green@cygnus.com>
-
-	* gcconfig.h: Use libgcj hack for Alpha Linux.
-	Undefine MPROTEXT_VDB (from Jeff Sturm).
-	* os_dep.c: Remove Alpha Linux hacks.
-	* misc.c: Ditto.
-
-1999-12-13  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure: Rebuilt.
-	* acinclude.m4: Changed version to 5.0a4.
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgcjgc_la_LDFLAGS): Changed version to 1:1:0.
-
-1999-12-12  Anthony Green  <green@cygnus.com>
-
-	* gcconfig.h (DATASTART): Define as (&data_start) for PowerPC
-	Linux.
-	(DYNAMIC_LOADING): Define for PowerPC Linux.
-	* os_dep.c: Remove some special cases for PowerPC Linux.
-	* misc.c (GC_init_inner): Don't call GC_init_linux_data_start
-	for PowerPC Linux.
-
-1999-11-04  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgcjgc_la_SOURCES): Removed quick_threads.c.
-
-	* misc.c (GC_init_inner): Don't call GC_init_linuxppc().
-	(GC_thr_init): Don't declare.
-
-	* configure: Rebuilt.
-	* configure.in: Removed qt threads case.
-	* dyn_load.c: Don't mention QUICK_THREADS.
-	* os_dep.c: Don't mention QUICK_THREADS.
-	* misc.c: Don't mention QUICK_THREADS.
-	* gcconfig.h: Don't mention QUICK_THREADS.
-	* gc_priv.h: Removed QUICK_THREADS code.
-	* quick_threads.c: Removed.
-
-1999-11-03  Tom Tromey  <tromey@cygnus.com>
-
-	* gcconfig.h: Merged in local changes from old config.h.
-
-1999-11-02  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* gcconfig.h: Don't define MPROTECT_VDB on Linux/i386.
-
-1999-11-02  Tom Tromey  <tromey@cygnus.com>
-
-	* quick_threads.c: Include gcconfig.h, not boehm-config.h.
-
-	* configure: Rebuilt.
-	* configure.in: Don't create boehm-config.h.
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgcjgc_la_SOURCES): Reference gcconfig.h, not
-	config.h.
-	($(all_objs)): Depend on gcconfig.h.
-	* gc_priv.h: Reference GCCONFIG_H, not CONFIG_H.
-	* gcconfig.h: Define GCCONFIG_H, not CONFIG_H.
-	* config.h: Removed.
-
-1999-11-01  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (gctest_LDADD): Added THREADLIB.
-	(TESTS): New macro.
-	* configure: Rebuilt.
-	* configure.in (INCLUDES): New subst.
-
-1999-09-29  Steve Chamberlain  <sac@pobox.com>
-
-	* config.h: Added picoJava target.
-	* mach_dep.h (GC_push_regs):  New code for picoJava.
-
-1999-09-28  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure: Rebuilt.
-	* acinclude.m4 (LIB_AC_PROG_CC, LIB_AC_PROG_CXX): Provide
-	appropriate AC_PROG_ symbol.
-
-Tue Aug 10 00:08:29 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* gc_priv.h:  IRIX thread changes from
-	include/private/gc_priv.h.
-
-Mon Aug  9 18:33:38 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
-	builds.
-
-	* configure: Rebuilt.
-	* configure.in: Properly align --help output, fix capitalization
-	and punctuation.
-	* acinclude.m4: Likewise.
-
-1999-08-04  Tom Tromey  <tromey@cygnus.com>
-
-	* configure.in: Added missing `;;'.  From Anthony Green.
-
-Mon Aug  2 23:09:41 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in (machdep): Use mips_ultrix_mach_dep.s on Ultrix V4.
-
-1999-08-03  Tom Tromey  <tromey@cygnus.com>
-
-	* gc_priv.h (GC_test_and_set): Implementation for Linux PPC from
-	Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
-
-1999-08-02  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure: Rebuilt for new libtool.
-
-1999-07-31  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-	* mips_sgi_mach_dep.s: Enable PIC option.
-
-1999-07-19  Tom Tromey  <tromey@cygnus.com>
-
-	* config.h (MPROTECT_VDB): Don't define on Linux.
-
-1999-07-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-	* Makefile.am (.s.lo): Avoid `#line' directives.
-	* Makefile.in: Rebuilt.
-
-1999-07-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-	* Makefile.am (*-recursive, *-am, *-multi): Automake does not
-	generate *-recursive for this Makefile, use *-am instead.
-	* Makefile.in: Rebuilt.
-
-1999-06-30  Alexandre Oliva  <oliva@dcc.unicamp.br>
-
-	* Makefile.am (.s.lo): Renamed from `.s.o'.
-	* Makefile.in: Rebuilt.
-
-1999-06-21  Tom Tromey  <tromey@cygnus.com>
-
-	Alpha patch from Jeff Sturm:
-	* os_dep.c (GC_init_linuxalpha): New function.
-	* misc.c: Initialize for alpha linux.
-	* gc_priv.h (GC_test_and_set): Define for alpha.
-	* config.h: Don't assume __data_start on alpha.
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgcjgc_la_LDFLAGS): Use -version-info, not
-	-release.
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (toolexeclibdir): Define as libdir when
-	appropriate.
-	* configure: Rebuilt.
-	* configure.in (USE_LIBDIR): New conditional.
-
-	* configure: Rebuilt.
-	* configure.in: Recognize all forms of alpha.
-
-1999-06-17  Anthony Green  <green@cygnus.com>
-
-	* mach_dep.c (GC_push_regs): FreeBSD-elf support (from
-	Carlo Dapor <carlo@vis.ethz.ch>).
-
-1999-05-05  Gilles Zunino  <Gilles.Zunino@hei.fr>
-
-	* configure.in: Switch from irix threads to posix threads
-	Defined IRIX_THREADS. Put mips_sgi_mach_dep.lo into machdep
-	for mips architecture.
-	* configure: Regenerate.
-
-1999-04-30  Tom Tromey  <tromey@cygnus.com>
-
-	* linux_threads.c: Don't reference __pthread_initial_thread_bos.
-
-1999-04-26  Tom Tromey  <tromey@cygnus.com>
-
-	* dyn_load.c (GC_FirstDLOpenedLinkMap): Declare _DYNAMIC as
-	`weak'.
-
-1999-04-23  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in, configure: Rebuilt.
-	* Makefile.am (EXTRA_LIBRARIES): Mention libgcjgc.la.
-	(libgcjgc_la_SOURCES): Renamed.
-	(libgcjgc_la_LIBADD): Likewise.
-	(libgcjgc_la_DEPENDENCIES): Likewise.
-	(EXTRA_libgcjgc_la_SOURCES): Likewise.
-	(gctest_LDADD): Use libgcjgc.la.
-	(all_objs): Mention libgcj_la_OBJECTS.
-	(EXTRA_LTLIBRARIES): Renamed.
-	(toollib_LTLIBRARIES): Likewise.
-	(libgcjgc_la_LDFLAGS): New macro
-	(toolexecdir): Renamed.
-	(toolexeclibdir): Likewise.
-	(toolexeclib_LTLIBRARIES): Likewise.
-	(LTCOMPILE): Renamed; added libtool invocation.
-	(LINK): Added libtool invocation.
-	(.s.o): use LTCOMPILE.
-	* configure.in: Call AM_PROG_LIBTOOL.
-	(target_all): Set to libgcjgc.la.
-	Mention `.lo' forms of object files.
-
-1999-04-21  Tom Tromey  <tromey@cygnus.com>
-
-	* misc.c (GC_init_inner): If QUICK_THREADS defined, compute
-	GC_stackbottom.
-
-	* os_dep.c: glibc 2.1 requires asm/sigcontext.h, not
-	sigcontext.h.  From Matthias Klose <doko@itso.de>.
-
-1999-04-16  Tom Tromey  <tromey@cygnus.com>
-
-	* config.h (__start): Declare as `int' in alpha/OSF1 case.  From
-	David Pettersson <dapet@mai.liu.se>
-
-1999-04-14  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Don't use sparc_mach_dep.o for Solaris.  Reverts
-	incorrect patch of 199-04-09.
-
-	* configure: Rebuilt.
-	* configure.in: Added support for alpha.
-	From David Pettersson <dapet@mai.liu.se>.
-
-1999-04-13  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgcjgc_a_SOURCES): Added solaris-threads.c and
-	solaris-threads.h.
-
-1999-04-09  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Use sparc_mach_dep.s when building on Solaris.
-
-1999-02-23  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: For Linux, define _REENTRANT.  For Solaris, define
-	SOLARIS_THREADS and _SOLARIS_PTHREADS.
-
-1999-02-18  Tom Tromey  <tromey@cygnus.com>
-
-	* quick_threads.c (GC_push_all_stacks): Change order of arguments
-	to GC_push_all_stacks depending on STACK_GROWS_DOWN define.  Check
-	for case where LO is NULL.
-
-1999-02-10  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure, Makefile.in: Rebuilt.
-	* acinclude.m4: Updated to be used with automake 1.4.
-	* configure.in: Renamed libgc to libgcjgc.  Updated to be used
-	with automake 1.4.
-	* Makefile.am (EXTRA_LIBRARIES): Renamed libgc to libgcjgc.
-	(libgcjgc_a_SOURCES): Likewise.
-	(libgcjgc_a_LIBADD): Likewise.
-	(libgcjgc_a_DEPENDENCIES): Likewise.
-	(EXTRA_libgcjgc_a_SOURCES): Likewise.
-	(gctest_LDADD): Likewise.
-	(all_objs): Likewise.
-
-1999-01-08  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Define LINUX_THREADS if using POSIX threads on
-	Linux.
-
-	* gc_priv.h (GC_test_and_set): Put return type into definition.
-
-1998-11-24  Andrew Haley  <aph@viagra.cygnus.co.uk>
-
-	* Makefile.am: add support for eCos.  In particular, add C++
-	support for compiling the file ecos.cc.
-	* ecos.cc: new file.
-	* acinclude.m4: add C++ support.
-	* aclocal.m4: likewise
-	* config.h: add eCos support.
-	* configure: likewise
-	* configure.in: likewise
-	* misc.c (GC_write): add eCos support.
-	* os_dep.c (tiny_sbrk): add eCos support.
-
-Thu Dec 10 18:24:34 1998  Warren Levy  <warrenl@cygnus.com>
-
-	* misc.c (GC_init_inner): Moved STACKBASE code to os_dep.c.
-	* os_dep.c (GC_get_stack_base): Moved STACKBASE code from misc.c.
-
-1998-11-23  Tom Tromey  <tromey@cygnus.com>
-
-	* configure.host (boehm_gc_cflags): Don't add `-O2'.
-
-1998-11-20  Andrew Haley  <aph@viagra.cygnus.co.uk>
-
-	* Makefile.am, Makefile.in, configure.host: tx39 build option
-	"-G 0" added.
-
-1998-11-17  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Switch on host, not target.
-
-1998-11-16  Tom Tromey  <tromey@cygnus.com>
-
-	* gc_priv.h (GC_debug_object_start): Declare.
-	* mark.c (GC_mark_from_mark_stack): Call GC_debug_object_start.
-	* gc.h (GC_debug_register_finalizer_no_order,
-	GC_register_finalizer_no_order): Declare.
-	(GC_REGISTER_FINALIZER_NO_ORDER): New macro.
-	* dbg_mlc.c (GC_debug_register_finalizer_no_order): New function.
-	(GC_debug_generic_malloc): Likewise.
-	(GC_debug_object_start): new function.
-
-1998-11-11  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Recognize --enable-java-gc, not --enable-gc.
-
-Tue Nov  3 18:01:12 1998  Tom Tromey  <tromey@sanguine.cygnus.com>
-
-	* dyn_load.c: Handle QUICK_THREADS case.
-
-1998-10-21  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Put cpp defines here, not in config.h.  Recognize
-	--enable-threads.  Set INCLUDES.  Create boehm-cflags file.  Don't
-	define PACKAGE or VERSION.
-	* config.h (SILENT, NO_SIGNALS, NO_DEBUGGING, JAVA_FINALIZATION):
-	Don't define.
-
-	* os_dep.c (GC_default_push_other_roots): Define when
-	QUICK_THREADS defined.
-	* misc.c: Added QUICK_THREADS case.
-	* gc_priv.h: Added QUICK_THREADS case to define LOCK and UNLOCK.
-	* config.h (THREADS): Define if QUICK_THREADS defined.
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgc_a_SOURCES): Added linux_threads.c,
-	quick_threads.c.
-	* quick_threads.c: New file.
-
-1998-10-20  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure: Rebuilt.
-	* acinclude.m4: Don't subst machine_dir or sys_dir.
-	* configure.host: Removed unused code.
-
-Sun Oct 11 08:18:02 1998  Anthony Green  <green@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Fix typo in previous patch.
-
-Sun Oct 11 08:06:11 1998  Anthony Green  <green@cygnus.com>
-
-	* Makefile.in, aclocal.m4, configure: Rebuilt.
-	* Makefile.am, acinclude.m4, configure.in: Add multilib support.
-	* configure.host: Created.
-
-Tue Sep  1 10:58:15 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (lib_LIBRARIES): Use target_all.
-	(EXTRA_LIBRARIES): New macro.
-	* configure: Rebuilt.
-	* configure.in: Recognize --enable-gc.
-
-Thu Aug 13 10:52:45 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (COMPILE): Define.
-	(LINK): Likewise.
-	(.s.o): Use MY_CFLAGS.
-	* configure: Rebuilt.
-	* configure.in (MY_CFLAGS): Define and subst.
-
-Wed Aug 12 11:41:43 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Added --with-cross-host argument.  Use
-	$with_cross_host to determine when cross-compiling.
-
-	* config.h (SMALL_CONFIG): Don't define.
-	* configure: Rebuilt.
-	* configure.in: Define SMALL_CONFIG when cross-compiling.
-
-Tue Aug 11 11:41:25 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* solaris_pthreads.c, misc.c, gc_priv.h, config.h, alloc.c,
-	allchblk.c: Merged with 4.13a2 while preserving local changes.
-
-	* Makefile.orig: Updated from Makefile in 4.13a2.
-
-	* configure: Rebuilt.
-	* configure.in: Updated version number to 4.13a2.  On Solaris,
-	don't build with -O when using gcc.
-
-	Merged in version 4.13alpha2:
-	* config.h (USE_MMAP): Re-enable on Solaris.
-	* solaris_pthreads.c: Removed RCS Id line.
-	* alpha_mach_dep.s: Removed RCS Id line.
-
-Wed Jul 22 15:38:12 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* config.h (USE_MMAP): Don't define for Solaris.
-
-Wed Jun 10 12:51:41 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgc_a_SOURCES): Removed setjmp_t.c.
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgc_a_SOURCES): Removed add_gc_prefix.c.
-
-Thu May 14 15:32:58 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am ($(all_objs)): Depend on config.h.
-
-	* config.h: [MIPS] If DATASTART_IS_ETEXT defined then define
-	DATASTART as &_etext.
-	* misc.c (GC_init_inner): If STACKBASE defined, then use it.
-	* configure: Rebuilt.
-	* configure.in: Define STACKBASE and DATASTART_IS_ETEXT for the
-	tx39.
-
-Tue May 12 13:15:45 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* alloc.c: Don't call GET_TIME if NO_CLOCK defined.
-	(GC_maybe_gc): Likewise.
-	* os_dep.c: If NO_SIGSET defined, then have empty
-	GC_disable_signals and GC_enable_signals.
-	* configure: Rebuilt.
-	* configure.in: Added --with-target-subdir option.  If
-	cross-compiling, define NO_SIGSET and NO_CLOCK.
-
-Wed May  6 16:40:28 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (.s.o): Directly use CC -x assembler-with-cpp.
-	(AS): Removed.
-	* aclocal.m4, configure: Rebuilt.
-	* acinclude.m4: New file.
-	* configure.in: Don't run AM_EXEEXT.  Use LIB_AC_PROG_CC.
-
-Thu Apr 30 14:51:12 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* configure: Rebuilt.
-	* configure.in: Link boehm-config.h to config.h.
-	* Makefile.in: Rebuilt.
-	* Makefile.am (INCLUDES): Removed.
-	* config.h (SILENT, SMALL_CONFIG, NO_SIGNALS, NO_DEBUGGING,
-	JAVA_FINALIZATION): Define
-
-Wed Apr 29 11:03:14 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Many files: Use GC_bool, not bool.
-	* gc_priv.h: Define GC_bool, not bool.
-
-	* misc.c (GC_dont_gc): Define as int.
-	(GC_quiet): Likewise.
-	* gc_priv.h (GC_never_stop_func): Declare as returning bool.
-	* alloc.c (GC_dont_expand): Define as int.
-	* gc_priv.h: For gcc, define bool as char.
-
-Tue Apr 28 22:44:16 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (check_PROGRAMS): New macro.
-	(gctest_SOURCES): Likewise.
-	(gctest_LDADD): Likewise.
-
-Mon Apr 27 23:53:24 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.am (libgc_a_SOURCES): Added dyn_load.c.
-	* configure: Rebuilt.
-	* configure.in: Define SUNOS53_SHARED_LIB on Solaris 2.3.
-
-Wed Apr 15 11:40:56 1998  Tom Tromey  <tromey@sanguine.cygnus.com>
-
-	* Makefile.am, Makefile.in, configure.in, configure, aclocal.m4:
-	New files.
-	* Makefile.orig: Renamed from Makefile.
diff --git a/boehm-gc/EMX_MAKEFILE b/boehm-gc/EMX_MAKEFILE
deleted file mode 100644
index d7674b3a3e9..00000000000
--- a/boehm-gc/EMX_MAKEFILE
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-#  OS/2 specific Makefile for the EMX environment
-#
-#  You need GNU Make 3.71, gcc 2.5.7, emx 0.8h and GNU fileutils 3.9
-#  or similar tools. C++ interface and de.exe weren't tested.
-#
-#  Rename this file "Makefile".
-#
-
-# Primary targets:
-# gc.a - builds basic library
-# c++ - adds C++ interface to library and include directory
-# cords - adds cords (heavyweight strings) to library and include directory
-# test - prints porting information, then builds basic version of gc.a, and runs
-#        some tests of collector and cords.  Does not add cords or c++ interface to gc.a
-# cord/de.exe - builds dumb editor based on cords.
-CC= gcc
-CXX=g++
-# Needed only for "make c++", which adds the c++ interface
-
-CFLAGS= -O -DALL_INTERIOR_POINTERS -DSILENT
-# Setjmp_test may yield overly optimistic results when compiled
-# without optimization.
-# -DSILENT disables statistics printing, and improves performance.
-# -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-#   altered stubborn objects, at substantial performance cost.
-# -DFIND_LEAK causes the collector to assume that all inaccessible
-#   objects should have been explicitly deallocated, and reports exceptions
-# -DSOLARIS_THREADS enables support for Solaris (thr_) threads.
-#   (Clients should also define SOLARIS_THREADS and then include
-#   gc.h before performing thr_ or GC_ operations.)
-# -DALL_INTERIOR_POINTERS allows all pointers to the interior
-#   of objects to be recognized.  (See gc_private.h for consequences.)
-# -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-#   usually causing it to use less space in such situations.
-#   Incremental collection no longer works in this case.
-# -DDONT_ADD_BYTE_AT_END is meaningful only with
-#   -DALL_INTERIOR_POINTERS.  Normally -DALL_INTERIOR_POINTERS
-#   causes all objects to be padded so that pointers just past the end of
-#   an object can be recognized.  This can be expensive.  (The padding
-#   is normally more than one byte due to alignment constraints.)
-#   -DDONT_ADD_BYTE_AT_END disables the padding.
-
-AR= ar
-RANLIB= ar s
-
-# Redefining srcdir allows object code for the nonPCR version of the collector
-# to be generated in different directories
-srcdir = .
-VPATH = $(srcdir)
-
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
-
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
-
-CORD_INCLUDE_FILES= $(srcdir)/gc.h $(srcdir)/cord/cord.h $(srcdir)/cord/ec.h \
-           $(srcdir)/cord/cord_pos.h
-
-# Libraries needed for curses applications.  Only needed for de.
-CURSES= -lcurses -ltermlib
-
-# The following is irrelevant on most systems.  But a few
-# versions of make otherwise fork the shell specified in
-# the SHELL environment variable.
-SHELL= bash
-
-SPECIALCFLAGS = 
-# Alternative flags to the C compiler for mach_dep.c.
-# Mach_dep.c often doesn't like optimization, and it's
-# not time-critical anyway.
-
-all: gc.a gctest.exe
-
-$(OBJS) test.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \
-    $(srcdir)/gcconfig.h $(srcdir)/gc_typed.h
-# The dependency on Makefile is needed.  Changing
-# options such as -DSILENT affects the size of GC_arrays,
-# invalidating all .o files that rely on gc_priv.h
-
-mark.o typd_mlc.o finalize.o: $(srcdir)/include/gc_mark.h $(srcdir)/include/private/gc_pmark.h
-
-gc.a: $(OBJS)
-	$(AR) ru gc.a $(OBJS)
-	$(RANLIB) gc.a
-
-cords: $(CORD_OBJS) cord/cordtest.exe
-	$(AR) ru gc.a $(CORD_OBJS)
-	$(RANLIB) gc.a
-	cp $(srcdir)/cord/cord.h include/cord.h
-	cp $(srcdir)/cord/ec.h include/ec.h
-	cp $(srcdir)/cord/cord_pos.h include/cord_pos.h
-
-gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/gc_cpp.h
-	$(CXX) -c -O $(srcdir)/gc_cpp.cc
-	
-c++: gc_cpp.o $(srcdir)/gc_cpp.h
-	$(AR) ru gc.a gc_cpp.o
-	$(RANLIB) gc.a
-	cp $(srcdir)/gc_cpp.h include/gc_cpp.h 
-
-mach_dep.o: $(srcdir)/mach_dep.c
-	$(CC) -o mach_dep.o -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-
-mark_rts.o: $(srcdir)/mark_rts.c
-	$(CC) -o mark_rts.o -c $(CFLAGS) $(srcdir)/mark_rts.c
-
-cord/cordbscs.o: $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c $(srcdir)/cord/cordbscs.c -o  cord/cordbscs.o
-
-cord/cordxtra.o: $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c $(srcdir)/cord/cordxtra.c -o  cord/cordxtra.o
-
-cord/cordprnt.o: $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c $(srcdir)/cord/cordprnt.c -o cord/cordprnt.o
-
-cord/cordtest.exe: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a
-	$(CC) $(CFLAGS) -o cord/cordtest.exe $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a
-
-cord/de.exe: $(srcdir)/cord/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a
-	$(CC) $(CFLAGS) -o cord/de.exe $(srcdir)/cord/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a $(CURSES)
-
-clean: 
-	rm -f gc.a tests/test.o gctest.exe output-local output-diff $(OBJS) \
-	      setjmp_test  mon.out gmon.out a.out core \
-	      $(CORD_OBJS) cord/cordtest.exe cord/de.exe
-	-rm -f *~
-
-gctest.exe: tests/test.o gc.a
-	$(CC) $(CFLAGS) -o gctest.exe tests/test.o gc.a
-
-# If an optimized setjmp_test generates a segmentation fault,
-# odds are your compiler is broken.  Gctest may still work.
-# Try compiling setjmp_t.c unoptimized.
-setjmp_test.exe: $(srcdir)/setjmp_t.c $(srcdir)/gc.h
-	$(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/setjmp_t.c
-
-test: setjmp_test.exe gctest.exe
-	./setjmp_test
-	./gctest
-	make cord/cordtest.exe
-	cord/cordtest
diff --git a/boehm-gc/MacOS.c b/boehm-gc/MacOS.c
deleted file mode 100644
index cc12cd15d98..00000000000
--- a/boehm-gc/MacOS.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-	MacOS.c
-	
-	Some routines for the Macintosh OS port of the Hans-J. Boehm, Alan J. Demers
-	garbage collector.
-	
-	<Revision History>
-	
-	11/22/94  pcb  StripAddress the temporary memory handle for 24-bit mode.
-	11/30/94  pcb  Tracking all memory usage so we can deallocate it all at once.
-	02/10/96  pcb  Added routine to perform a final collection when
-unloading shared library.
-	
-	by Patrick C. Beard.
- */
-/* Boehm, February 15, 1996 2:55 pm PST */
-
-#include <Resources.h>
-#include <Memory.h>
-#include <LowMem.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gc.h"
-#include "gc_priv.h"
-
-// use 'CODE' resource 0 to get exact location of the beginning of global space.
-
-typedef struct {
-	unsigned long aboveA5;
-	unsigned long belowA5;
-	unsigned long JTSize;
-	unsigned long JTOffset;
-} *CodeZeroPtr, **CodeZeroHandle;
-
-void* GC_MacGetDataStart()
-{
-	CodeZeroHandle code0 = (CodeZeroHandle)GetResource('CODE', 0);
-	if (code0) {
-		long belowA5Size = (**code0).belowA5;
-		ReleaseResource((Handle)code0);
-		return (LMGetCurrentA5() - belowA5Size);
-	}
-	fprintf(stderr, "Couldn't load the jump table.");
-	exit(-1);
-	return 0;
-}
-
-/* track the use of temporary memory so it can be freed all at once. */
-
-typedef struct TemporaryMemoryBlock TemporaryMemoryBlock, **TemporaryMemoryHandle;
-
-struct TemporaryMemoryBlock {
-	TemporaryMemoryHandle nextBlock;
-	char data[];
-};
-
-static TemporaryMemoryHandle theTemporaryMemory = NULL;
-static Boolean firstTime = true;
-
-void GC_MacFreeTemporaryMemory(void);
-
-Ptr GC_MacTemporaryNewPtr(size_t size, Boolean clearMemory)
-{
-	static Boolean firstTime = true;
-	OSErr result;
-	TemporaryMemoryHandle tempMemBlock;
-	Ptr tempPtr = nil;
-
-	tempMemBlock = (TemporaryMemoryHandle)TempNewHandle(size + sizeof(TemporaryMemoryBlock), &result);
-	if (tempMemBlock && result == noErr) {
-		HLockHi((Handle)tempMemBlock);
-		tempPtr = (**tempMemBlock).data;
-		if (clearMemory) memset(tempPtr, 0, size);
-		tempPtr = StripAddress(tempPtr);
-
-		// keep track of the allocated blocks.
-		(**tempMemBlock).nextBlock = theTemporaryMemory;
-		theTemporaryMemory = tempMemBlock;
-	}
-	
-#     if !defined(SHARED_LIBRARY_BUILD)
-	// install an exit routine to clean up the memory used at the end.
-	if (firstTime) {
-		atexit(&GC_MacFreeTemporaryMemory);
-		firstTime = false;
-	}
-#     endif
-	
-	return tempPtr;
-}
-
-extern word GC_fo_entries; 
-
-static void perform_final_collection()
-{
-  unsigned i;
-  word last_fo_entries = 0;
-  
-  /* adjust the stack bottom, because CFM calls us from another stack
-     location. */
-     GC_stackbottom = (ptr_t)&i;
-
-  /* try to collect and finalize everything in sight */
-    for (i = 0; i < 2 || GC_fo_entries < last_fo_entries; i++) {
-        last_fo_entries = GC_fo_entries;
-        GC_gcollect();
-    }
-}
-
-
-void GC_MacFreeTemporaryMemory()
-{
-# if defined(SHARED_LIBRARY_BUILD)
-    /* if possible, collect all memory, and invoke all finalizers. */
-      perform_final_collection();
-# endif
-
-    if (theTemporaryMemory != NULL) {
-	long totalMemoryUsed = 0;
-	TemporaryMemoryHandle tempMemBlock = theTemporaryMemory;
-	while (tempMemBlock != NULL) {
-		TemporaryMemoryHandle nextBlock = (**tempMemBlock).nextBlock;
-		totalMemoryUsed += GetHandleSize((Handle)tempMemBlock);
-		DisposeHandle((Handle)tempMemBlock);
-		tempMemBlock = nextBlock;
-	}
-	theTemporaryMemory = NULL;
-
-#       if !defined(SILENT) && !defined(SHARED_LIBRARY_BUILD)
-          fprintf(stdout, "[total memory used:  %ld bytes.]\n",
-                  totalMemoryUsed);
-          fprintf(stdout, "[total collections:  %ld.]\n", GC_gc_no);
-#       endif
-    }
-}
-
-#if __option(far_data)
-
-  void* GC_MacGetDataEnd()
-  {
-	CodeZeroHandle code0 = (CodeZeroHandle)GetResource('CODE', 0);
-	if (code0) {
-		long aboveA5Size = (**code0).aboveA5;
-		ReleaseResource((Handle)code0);
-		return (LMGetCurrentA5() + aboveA5Size);
-	}
-	fprintf(stderr, "Couldn't load the jump table.");
-	exit(-1);
-	return 0;
-  }
-
-#endif /* __option(far_data) */
diff --git a/boehm-gc/MacProjects.sit.hqx b/boehm-gc/MacProjects.sit.hqx
deleted file mode 100644
index 99dff88b4cf..00000000000
--- a/boehm-gc/MacProjects.sit.hqx
+++ /dev/null
@@ -1,886 +0,0 @@
-(This file must be converted with BinHex 4.0)
-
-:$deKBe"bEfTPBh4c,R0TG!"6594%8dP8)3#3"&)e!!!"4UiT8dP8)3!(!!"50A*
-
--BA8#ZJ#3!aB"#3d0#'GM,MBi5bkjBf038%-ZZ3#3%)Zi!*!8"@`!N!6rN!4069"
-
-568e$3`%!UbqAD+X`19S!!!Ba!!!,*J!!!F%!!!-PfTmj1`#3"PET)d31)LTH6H4
-
-#*AqG5b5HI*)QjY$IIb00%ReTJSi6rG$jG(bZ,"Rc,9Umf[IRj)6FZ-j`GfGR)#!
-
-m-#qLqB#cj'G%46qffB3q8AppLXKc+P&*il4FMJMq3N32r[U,(PlSNdrQm-J(4!p
-
-jK)NHmKJSHY!,&chS$4)pk%8mL3I)B0'$AU6S3'q)k%%[5[5J&ffa#68)0ZM&#T!
-
-!*fHC-2dFZ3i83[Vr[4Xh'+DNQrm'J)rrpqe%ST`,FeVi6b,*qHH")4eQc28NFMN
-
-ZT*m,L"Y%-`pdAk6RLHDaeVV0a,,@P(4UUK66rUM'8bf91llS("lTh81)MBQ+4*q
-
-rfHENEhD)Ke#3!09'M%bL[P1+G88fa$3e)5Gpf0kARpBf*6eIH*0`ZBHR%ii"PbN
-
-+D&*)688M)Sm$Bm[cCdDjh2YIjmAc`(TVpi*Vka((A*&Yl@'LTSH1M*AMP#,2[A$
-
-(FHA@S"dL4dER#3b!EfBYem(C9P5iGH"a-bb-AL(F"bb-AL,F6)%a9pJUL,(hf%B
-
-TeQb["X5ib4DQXV!-fa6&mZf&3,(C&UDd-((SpeMBEIB`8Zc,BcZR3A5'X+jYj$'
-
-6)6HVV+R[!`#3!`X!(E@*MFQ%R4d"))`m[3JM[c)bBS54Tj'M(AP+MK&f%VD5SdG
-
-SANFB@3Rqc$Am83(+)`"G(D%A'9!bBQ6!b)b4Sq3SH8D1NDGNX$)bBi54!51--$*
-
-Kj0L!M"KKK"dC--,)-h+-6#KKC-$)-F)NamL!!Z06#X!!b&%bBUHp8RcN'%%6!b,
-
-i!!kV"`"DLHFaK*!!"Ym4K,,2i2X4c[,`c5!GIPf!ZcNi'8'VfJFpSfdpq+CY$8j
-
--V'f-DZr2[36#1(ael5hmfT@1cSU66D5pqDSA89pdTP-`Z[jj6T&!PmZBFZjal"&
-
-5iG6#blE$+&kLh#QZ118&(0T1J(hZ,9)5MJ9ic*qPI!ac'RJ96QMZjSbkMq()Ui6
-
-B+f,,#'N1icbM4N"aaBr1`3Z9U'8RY'XAiVXFKp#&k2D5Be%VCdh4%,+2QS'b"Q2
-
-%0PNT4rE#%kTUFqYDM56bVjfe!p8MqmL)1VmjVkJY`U[*$&*L3AMSpB@LCQ*U&l%
-
-T+3890rL,V9klFN*4@f0UTf8Z&&afN!"4GC6G8p3fN9$4+4[-@DAeK%lej"@eAAL
-
-eU@&4[Tm28%mqqUkS(F+VDa#lB&'rlRAllRP&l460Qc,)MHR$jMh@$8Y4Xc'e`cd
-
-ZE2AUUiH+fK96feb$epq&'RAQeLG&lCDjmP+"Kr8k9#qp'eI8RPf[6R$dS+$UcqI
-
-ELYSV[*ETFL&j[@lr803qd9I2A#bi4Vei3*d[+@Urk*!!&abe0HTVm%44"i4A6JN
-
-c(2I!kjRl6a9e813DK"A6p(LjRZZGaGH+1L5SiBT[(6ekd2*ILMSXU(l)#m3QMDB
-
-V+QTG!r*NG#RQai#DNh4,l0&!Ie`dYi98Y1%1A$5hKP4,`d9cHdKP'LkD@q4hYC*
-
-%dfdLeCCNN@i9UIBNLh5l5(8N68qhM&4R`d9cfdKP'bkD@dHU+qe&XRfNZSqc10j
-
-#8Me*&ZNfNZT0hSYd+dP&ri-FGM6G6P,p5D,rPNT0`dQLk5+6'NLb5"HDe'$L)Pe
-
-X8N2bj-Z'$r$6-$NZjLGC)1lB-"jQSff@[ak%LJ[rI#%p2ddAGREN(@"V+,S6CI!
-
-I!!!0$3KRBbj38%-ZZ@0M8&"$,VN!N"#$BJ#3%4B!!!d'!*!%rj!%68e38Ne33d-
-
-"!+X[PfqV-$P*!!!'-3!!&UB!!!(&!!!&C80(jji!N!BMM#0%$L)UANhN3L9rV@9
-
-B`f#c2p$XpAVVCc-[`k20Y5bJ+CTHPScj`Z'!lmr*#EPaRH(ZcR!J!!rqMKG"q)#
-
-cj'G%46qffB3q8Aqp4R6FA83PM6`KUjaYD&IlZ@jDrY"pk[b&AZrdH*kFbb9PM*S
-
-`4Kh$c8Lf0bVe+Y`Q$amM6mc%*C1(jF&1bFSdGIlLpc*04b#X&D8[&6R%+-#6HhJ
-
-kX"#A+Bp6%6RGkB&kM%'jh$ZLmam[1Irq,r82rGM"5H4bh1ZB+b"Z%&-pD)5CL9(
-
-AP(4UUK6$!(lkH+UPFXFARF-MIHHMXf!5Nd%SZYRQj'pfL)G3N!$94X#(q25G8U`
-
-VXL'QU3Njk8[phV2@0Q92J#d6rA2N1["[!%c(M4X-8p,0IcYJf2lRBmD2c)*RQEF
-
-68m'9jqq*MjHTji&GqDp$kh501r9fqVPJe4iQDRS)L!)ELqiX08i#@40jpP1+F@p
-
-iC&))L)Qq4Bk-cK-i*h`cDlN1cMBUbZA3+beKhX*-&UD`X%ME%F91fHB3BaCC''Y
-
-KNba-C@(,"-40Yl"l,#c8`YCDf%#"XGD%F4m3'*i'k"iah[Ddam+k"Xd3eV@02'B
-
-bj'D90I9p!!!-q)[jAU2HhQ[NiCQC&f(Ne`JR!hlN1''4Sjc`)hcL5IK+f(@8(q&
-
-(1&Nj2XreTBI[M!0dGB4'MK01#CFF2c,JK"*1MNZ1(q&(11@5ii5EKimF*ja``Np
-
-#bA(#bBL6BpQ6jq5imT-m2mQ!dq2N'H&2RT2M%Nii'6$J,PF!#N#jGS3IS9Uba%G
-
-'A-)*8[#%!j-9'#r3@EpUPQ9+NL6$ldj*kVS6INIK@`*q'q$hGRJCPb,`pUJm(fQ
-
-3!#mGrdQqe$Nm22hkJ2cerNp"i3$m4Z62S5YA40V([V`MbHF@)QPT2IN@3@$ceHm
-
-I&dT3GqF9K,'&&8[6LKMTbQ6@-*%bJE#4RM,b'FA*'VC5`0BBdTa"@aNXM#)mU'"
-
-N@d@XSIKMMiMh#RbbLSjLT49GG9"F84)Q8QfN&![N1hK"A'V5F,,dJIF@+`iNJEb
-
-H-(5Nar84j!"*Q54MH+j&08dYQc,(ipT9I+aFqIQc-XP313&803UUPPD4*+UAIlj
-
-$U+jMAP1QUSfEYV2Qp4HKfZ#TYQTCT)hEaCbp+ZXH0"m5USfHDV1HbL4cCT@41rr
-
-5+d+eL4&+'hR90)iLRp$LYcm)e5McQN@UMR#&$kKqr%eHU-DBejbUCC-k+P4N5r%
-
-Iha+Uc5aj)kVfm*'ej*8Dali5ULfHDLah-l$Zfer1#G9@6l8TTf*r,RKTZ2#Q8'h
-
-MA2&i%MYq(0aCicHKfPlfDYLeJ3*FFEG3l@"HmfJbqFrdHU&IU+jRHE95BmQFkJF
-
-29)qp)93hX!aCGLfYP0!jSEU4HF9)-e8M9rADGfC4U(BbVVC66+8XR2Hj2RAmGk'
-
-kLDNk8`@p0[6F"hrG,e3h`kmm(BhDMQjBm@`ejDH1pG)YbUXYM'Y'5aD`-H(VPZ)
-
-,*i6A,Nqe)D1Y'5@UV@HM3VAE)a3$3MT+9jAGa)HI#%*E@9ie+jmf-PA9dY#66`Z
-
-[fkMA!l&$eZ3)bP996crcal6`ZRdT$9NG0S#+V([`rRZ&eae,A%dMGB2V4H%9YPL
-
-LfZ3B194,NC[ik!QKZSYlaE"deVc1$3[9(XVeFJIG0T,9**@'AVXJZ2Db$%'!,$a
-
-e+d2+8SES`Z&RD1(C`m,VlM*Aj)cP#M@ZlJI#Djp(U28`fl)VL9dKY+IXeFM!HRJ
-
-MVc0#YCpj6@!,M0VrHYh,CMQN!FBjl1ZVEPhjaCK)``"6,6JiU@@ekMjdmEEPI@M
-
-3DpXKj3pi+f`LFFpIUPrF058)N4X)f4ZQ*P5c1[&!pGhC4i@Ue2BCE"bRL&haLRk
-
-Thb#ZUK&ZK-Kc9k4Z-[QKhdaf&1KhN!#*#IdZ-XfJhdPQ)I6l#![SYjD'HXp$hdA
-
-f$1LhNlN-r4DbV8$I8iS[RSEqj#URqY@$9b3dJG1XG))%khUHJMX,Vh896Z%"I%B
-
-PFK1MejpP2[@,$LpbTe[Q%h#[hhai0BBHF+r-MrTeL9G6k!!IKHa1rmf2qMf,9c6
-
-d)%I[5Hq$1hVVq60(`H@-9fb&cfkb$BBDc1-Ck@@#jrVH%0cXH$@cIK[C#F&2Q9X
-
-[qpl(HTpEQ9F`KqVA3&iYS3Pl6#ARpIXMVpCP6[+ma`PkbJPkbJPkbJPkbJPkbJP
-
-kbJPkbJPkbJPk1MHKTlbJTlbJpqGlF2RNe4CD`1XDTfUZEYjDHE@[F0T$,KbK"Vc
-
-mA!9AAPiGS3Qjm[HQi+l-LraVj'p1i3&mcNKce1@eZ4pFX(PY@1(66rD18)Im"eF
-
-YAJ1K#AYcK92peXpVBfM#AZAIKi*r&r$U$"h)dkhp2[JI!kp0S3GjhdZZV))A!43
-
-jH4kk(TLQKF4pTXhHI!ITRb%hcX3KfeN#**1EI54a"'@Z8(9Dm%D@b"Y#qhm!N!-
-
-0!!PRBfaTBLda,VPM8&"$,VN!N"#ah3#3%!9X!!!I``#3"2q3"&"56dT,38K-!3#
-
-TY1))Uc!eD!!!@F-!N!B563#3"2$I!*!)22J1`2KbNQaPEr+hGEX``Jk!Vpa0&eT
-
-RDl*eSGZ&%EEAc@iGG+hAYBDRapHZd6ETQH'lV2AbpMVJ4lN,ck0G4lMb)fcKAQi
-
-*AeLhm1)VRfPGM,"Zi8pBG1%a3VYZi@m,@rM#2'iAfhjHacE,K"[bJGYB,ZcNP&#
-
-"$cqJ[fRG`SmXR'aMC-H6r-)AXTaNHE+Fj"HkN!"0"R[G!H4jITB&`!(!dKX"PZ#
-
-Z+PX+S(dCS&YGZI3,cN3L+P4H)V5R@D3p,54$JD"3'!j')mhRcl%mUJ)9e2PVUaF
-
-j[6lNX)ll!4,jajb6UrZK!hSTX[caD`$ZIHl,pdeVm&EaLeKG-YjQB6AKT)84pF,
-
-kB$+55%ID`b-4QF0T19ckfSl,d['15$X-4cTr0"2!dIR5%1j[S4JQa0,J4lT!pkc
-
-"EjcQ2ZmmNDF36,1DH)X!8($N3ihbR+mcX1GC!E!0fi)+ra)rCUL`#HU&V9)ke`6
-
-IhTB!b&RK%B!&4fA8Ecr8+8IBcr)4Z8L+$bmVaA0$-Lr)$3+SMf0Xkh!%1L(hiM$
-
-H56i!P'Q(V3ZXrmCRE,f[6f'0N!"Z$E6%fl(AqCL20Ka-#kRdjh`qA&CRACe[!5i
-
-+PSiKjh)6PJM4H$#5%&U%HF#GqF0F$MM6fH)T68dFSQ!hQ*["e3hGME'TS#e`Fmq
-
-Sl`'0qRTZMfEcM@b8M`(hV,a,kqB4N8iZ[4Sh5b!9ddQpT9YP#5UK!NX`BDbr,"E
-
-!TME)X#08Bm,*$)fP2Ci@G1bTGUbETe@@q%4QL60h[2d5)BQGX-U5,*6)q)99'NX
-
-bP3a1pJZTH#BC&"!P%4'5XP`!Fm82LidDE@#h&eejC#m'cSQd"k1C&S(CD`*"Va"
-
-S%C+TmmkE6aJ*6S3kTd8)4GS&PNjQ"#DY1419T&!JQT+cV-0*5@'9$$5+K-58Y"%
-
-N8Ea'&)q3!*!!UeBZ'qd'!&14D",LQVJ'$qTI1DUU3$%0cAD!e9HMkl`KaGAASBj
-
-TJ#pMhSb5Rq0c+LJ3l3LJkD2dcrJM2Q%3Kh&mZL-JR(&m+L$L-)j29b,%B4br8)j
-
-X!Y$j4ZUh`)[eI!A!R(d!4AHG`LH[d[f@re6*b2mAI`)H5F0aI+2XYq2iC)+N`6M
-
-qC$b5"Z2ij,N%KHI*24K!$k@Plm*Hm'Rd8-bci0h@*rK6m%JDM[-[aZ1Nhq+IKNH
-
-UJA&mE-V&'KM(2a129!2Mq2,5(2qIrSHmNfTSR2rTH+3D'XHRfL81irM8FE,Ep4r
-
-eTUeM[5Ra8bilkJJ6f!)lF0e(0'p*Cke+2Nq9ccEjh#UIZq6c&[RmM(3ZV*!!cL0
-
-k&5l"Jp4$Ilc)-m$9BDMqeV0m$l6LhM(EAX9A,10lG,aR)2GNb6Sm29&b0@CfmMd
-
-&Mr!pHLh'hX&p"qiPVV#h)jIcaN(YAHVY!-im,lH&lp&Fc$pX!KD$+,qKqbMQh",
-
-@BjDAX[M-KFF0&bH!le%r'GC@E`LVXP9mKXdeG)3QcED[U18Vq4jY2c-fD8XFl$a
-
-Jb0pEdXPRCYXVR!e1c(f%qF`GKAUQcPT3T6E-YjCF2GYHhq#[aqa0'*p@XJl4r*8
-
-qM(Fa(e1(MAb2DUZDVTq-SD2mJ+kFAj*ldAQmX-KFQf"C5i,E1fA&P2jHj`!8*c4
-
-Cbq,eU+LUqmriLrQ-H$8"RJ(GXC,YKXYCKk(M!EcN!3MV-HG3b@DB@MEAd"P5,9[
-
-2CjDYplkH1ckr$1D5aNf'jH[,p0ehXaPCKe@(eI0#11SC',UQT)X9K3qD(G8hK#c
-
-C@GQUfADhU*AQPE#2X"A&i-9KaAUdDe$"bpQU)@mfJNfL,U61YQ4RBFiKFac+[hC
-
-Y@49Fi(Ye4UjKII9Fl[b`UM[(Ca+6ZhF[@mq`0Seer)R3*#Y$$IcK`pPc%EI6FKZ
-
-I`IV"'%bLZK'Mdl!5jqQ+3J!feU'k*f(FZf(EGY@@N!!CGAmMqd9@CrDD68d'jf(
-
-3TlQV6AYhAEJlGh4$epjV3bSqBiDXKA!BPjeTVUYp1pI,DPfESAK1"2eSD[B-elh
-
-H#"KCEIFl0K-Um0E-CFr[,$HC6Hhc`fDr-eb-HmN5*`iSE-8)!#TL+mfKpUV"jrc
-
-$X6fMXIlRYZ5'5$I94YXX-&C(`""L$Dkf)VmVe*%)GZr'mh(#3i3EqlYKNKblRf*
-
-'9fi`h"aV43`ejERI0DPfA"MDB``XX)HHa#bYS3h1c!hCcPlQ0+mDh0Yr`mEU8Hk
-
-YrAmUXCIMj8SFBkA%6iNVCjRI%C(IMj&E3@l3G[C&a#hGId-rBQbXrT)c0e6q'2p
-
-eC)89`[fJmPd62,qrh"5fBCA-$%rb1d1R5hbj`ddQ1G,60%Q1l'T#EqB1)110@)h
-
-%i!95M+ekEiM0HfqSHM1k9UQY&%V$jTQPB&VZFVm*4FmG"[Acbff$#qbZ,a3IKUr
-
-B"VZ2A1J-[B%elK$paa&k8Z63JaakNVNdL$c1fP%+A`QGIJ'bm6iH0ZklkX(0S"E
-
-8jP*3Mb,[3pbE@&fLD'2RS@ZY1`pG"kj1X1j#2R9*X*QX*TAMbYcVef*YX2)T6FA
-
-Q@D$Hf'AE5@VBGSP+2*elSqN#9T4Gc"`I)"SMr!P3K8hPL)Se--@E+!*#j8qBAdA
-
-F)f`H'*JMT!TSH@V*`'V2IZI1K@DpeEljYRXA2YJ9eU,IcfjLaVQJjXS%LTUELM'
-
-UNU1Q*M@HTVX(FV[-AA`QqadqFr3i9[JU81PlSB$r%d$A3iqhZfXV+KG!GjBeeU(
-
-[-cfI+9deX0(XqqDqeeCrEqGcqm6iUPf$i$#AQd`B@p0rSjJ6NR2d'hX'fX5-"MQ
-
-MU,pRS%(-F-NCDZeUk[$*BA*h$2XG9RaZHj-D6bq3!1YJC6AD61@QEFZ@lXi09,[
-
-#3r`40LMRE"V0'C!!FecYKJh1Q(D[`hN%90BLbX@@Y!c8C8j3QmY!ApD)[GhVGTJ
-
-**CcApF6MTA!ZjkemqUrh9AKG,PI[cVeVI+q#h6`$QIm$kKcXmZ"@c&ph+[pbaRf
-
-+-2[6I1-)JqV1YQR9UpZ-&Cd9Uc'6i5P6JCdV6"8c-TKV%$1eQ*@af2(L22GJCe"
-
-VaTDFcfaEffcXh1Pef-$Pm$Vic)0VQmqbL$(+mRVQJpGcr8kVcZZakIJ-9F5"VJ2
-
-A)XVacTfpDfd&ZhSY"9l2XleH6rpD3Epa6E1D10FlQJjH!G34SPGS&qM3*fC3Pe2
-
-L`2L%lVY,CV!*T39qcpXH[fHHVQRU'%UAhk2&Qk`VKaD[,i2ZHk`cX2[6K&iQRrQ
-
-lbPXmS@QX)1Y!&RH`da"Y"8BfPYDc4GPC#3lV4AhlG+E(2&HTGaMM!VD)&65CaPL
-
-Dr4lQB&J09`k9kE(,mhf[0f[T[[2#[mfpH2-6*6k4bk,U5Z`kcd%Ia$UcfEZ2Z!G
-
-1&'%PEF2B1aKl$'0hBH`R',X1BjX`pP1-h6AD-aHa8TJD0Z"T@[KdIJ$5L*0!R+1
-
-)NmCi#mDEj(J5i`fS4KaV[49[Y[ASjjGJCfSIkdaR)f+)e-#cLpMMH4iTJQFE+B$
-
-RFiN4RXfXNFpBZGXAc[3QM,G2Yh*CMh@3!(q8lFE6#ID-P'YZ"AefKT9M99N2Re%
-
-Z5UJ[cKd0UjR$Y@%N5eQr[bVdDANH1X3[2[#XjcJ0%Se1!jKa'U#f[M%BE`p&`TC
-
-@-mfEF*1J""c`J'Sc4b0!`0Q1cH9X!e(3aCl!)H`k4qIhpfYS1)*',+EMMLJR'JM
-
-*XAVRp4,L3*6EFHJLENI+bThcfZ@BBX$BV8U1Sr-@+@iljX&F'M+D6*J-'5#(%1k
-
-[1&EhlT'("@L3!%(&RA-a6V0,2#9X9%3D8*&8fT'k`V(k5V),NCZX$kh*MY@GDYV
-
-4Y-8%c[bAlh!l-U6&69c*e@N4Mj-C)C2d+XbiMLZjUSJ3--Aq8HQ-$[R0RcMaPa8
-
-e&lLqlpUj[TGS[iMVqri'VZr9AUl[KhZi[J-YA0r"GUl[d&eFhq'YA0rr0h*pEml
-
-RqYlHa2Ap"212)[Ba!pGh2-6e$Gc+p3dqbr80[FMe`hbZAjA&I4IA2aN0'##DQ-I
-
-F0B%8$M1bX*!!6V&dUi!$KD&N2-DNDAZFBic&F2BrKF2r6-!j%"D+4)8c'q,aD,f
-
-3!-3j51B9SJP@RdlLA(j+(8X++A@L25E3BD9ki@,HV9l@i1F0$6KDbP$RC(bL'2*
-
-%ikP8)(QCZL15MXe30%"dDAVbI)DMURqBCV&i5b4dfDrbrk!LN!!@@#SGL#9B+*j
-
-N3JH#Y3HLV#@5r"fhhq@IS5Jp9LM&BLQF6+PSMTk2cbS%9c)KQ@5a90K#Sf4N5PN
-
-S5M[3da4hiQK)k+XiA(ND$YpSYSe-m)LIZ,6N5rL%!p$M"e)Z2G@JJJ8FXU,((EM
-
-pQ)@$C4*&(*ZN6`SqKSGP)q02Q+F@[iqA@RaFJFBHbCM4qfMF%h!%89`D('LN6e`
-
-k'KDkIh4i5)XM8r4*4)JcM9hKZ+)%Kcj2Rl4%aj+pAcSALTmN,qQmF&6[3Z`$k*0
-
-%H%M18RJEF-b22R&0qM&+6,@P[&-a!BIik*1U!BGKe64B611lY)`iBNHI9"S+Ab9
-
-l)JjKd5HT3V25,H+!P%`9Z`rkT%9kNCS1THY!pHQ6Q&%@$8)T99L%Sfhd5H*hI$J
-
-64C28Y,C`Djl#m$6b!XGfTmrR*X8$d@L`Y6QkdK+%4i(E8[b59GP&,"cqQPC3ih4
-
-MlA''N6k&X1iVfl4IfC%6%hNG3kaD8[4Nmd+LGcpXR+[Xb-XNFZZYEkLS`Q4G+Yd
-
-5L413!'S-T`$1NR'U9P55`+R)+U%aM8!K9-"b-+[Xk$GR5FTkh)hN*rJB5@-L'EP
-
-%j(6IK+GdbSlH-e9"XT!!TkM$335*3-%BFqd`miD+#P4)M`VKJ,5STAS-5DFJ,A9
-
-lRF6mdQ"V)#Q+K-c,[YUNl&M9XNEZ@PkXmY(k8'eCj+P3G[5T%69*)e+cY5@CqV"
-
-#$%SP0969B)9`fR3N*L#-jAfF#50kqURL8%pU-)M3+FmipZBILqkTH!E9YJip)aj
-
-%`mKhi"GMeDhkeqSZq1IU*VIi[,SeRcM3"dM$M['C$j!!BhcZ!m11mCN2&2k,$aK
-
-qi32[Hr5%Rh[d,hX-I&T(k6&F2UIBBc4(!m'9d93k(d+2NBr*-djj`D*SpBJAZ,f
-
-9j!86F'3iZ$+9LDAqShqJf[jh,cLPbr2V[SPKZ8BUA*j'UT'@jR"M,2UIAFerUC*
-
-hbU&Hqqk24KaUB492qKV`$C4!&+Z"V#$rQ"GJ24rmKPrCa6X4KAZ0c$d@5+lmTal
-
-hVejS(qNI[*91V#iSP&p#b,2@2paR1A6E52mJe6FBBMJ1dGJL*2+9p3qIhj!![Bp
-
-M('C8fB"h)XK)5,I&%TpfThIZ`BHa&(9Vm2+9kL#QA,kQIZdYiIaLYrARRVV2f2q
-
-YNG[k'UGr%8DeBN-EK0EmEAlarTd(p5,rIHIa&j&hIpETLXk#R@jbC@-b,9jkj$[
-
-SG20dc3jaep#MG,*Rm*9,kClGd#jFfLM2Qq@TmibVrRcNcU2@95h1CX5Efl"&%5r
-
-8mURGV@U5ZdHGS,k4EYRemG4[EPCrFjZ4PqYQYFV$Li`LB4cI%5Ak4CIabTc4cV5
-
-Z`5pfTSPdXM(B'Xb,d*RQlCVl-6rbfNK(iUpddhemB9))4J14@"k%hM42efh'efl
-
-%*i192U1qBE',qSa81Y2F(%qfjbIV-mbRlM2Dk!QiiGN-X@CeBXhQjHJG2R%#l)P
-
-%*m$r!"'46R)DGS+2k[XNTp(qiGGq@r81$FI)IYZ`[)lZM!cTba)YbQKh2VHq(T'
-
-iYATPahXMf583L9i#-b!5'SA3JP$LMk5FV"eL5P&e,)!2AM(fqq[&rAqqJEX3ZJ0
-
-4GUAcq1#I[$MlrpXrj3jb$ZiY+2BkkdRM@qKR3r"mcb,mia%m2lM89dZ[Vqh!-,f
-
-QqNbpVjjZ29qJCq04M`2d!b+N'UT5MqGLqX832%q[Aej$mA2Gr%)2D,J,T!VQVUK
-
-`%6jhAB9V+HAI4,rjJHFl+Pb,m4eQEZZ5@KrPp5aF@N9GqC2+ql1S&YkPdTmG6Gr
-
-!qEV`09U+&4c&223NLQNk-DpALZNdR1mDqVXNM'QAB`crlBKL%mp(M*G"*FCZ`&J
-
-DZ&cZG*Ki-f,J@mmLMhX`*R29E-FB[Qe,XDNr4DlPFZc[1GrDKlkqQYkKeBBaYUl
-
-YEqK(@E3aM+N[HKM14ThU%2X*Hb(-`McNHXhpB"3j2BDaPJB6I!Ne%&qEaD`r`V`
-
-YU-G"k"3ar)MaKKaEKl'$NQC6hd1-Lq4B$Q0G-XB+e-BRajCJ,+'*V3bd4NrqAp,
-
-B[bJT[kddmXG*R(e#AIa5)9RRT[cr!`!!$3!*Cf0XD@)Y-LkjBe"33bkj!*!3qL)
-
-!N"!0"J!!,h3!N!6rN!438Np+5d&)6!%!UE6L#+X`0A!!!#*k!*!'$d%!N!43[J#
-
-3#1j"$F$iCXbcEQ9ffFS2dS@*jbZl63NYVcACZY$0##1XPDZ$V[@ke[$dmVQ6K5h
-
-FYGEmE+(Rmc@246PGf0D9hF)@VNAi`VhS`KGM(GQA+lmmdfiI)f`c`Tq`63P23V[
-
-Y`VEH`KHqX)9f(@(E*!Zrf-)@IZi)AhKXi3[E,M3j*432"&!HrHaD@&$M#f(,qq3
-
-@XL1hN!$"3Rk6AcKCb%+1%di@J&@""TeG+a&(42abSQ*m9@@VL(4[%29TUPEGj%S
-
-NfN09'd1a&"q0T8,*F(-`0#85E)pZZ-eZrEB+Z[80G6A,A6ir2'5jYd$i*mlPdrI
-
--@8-1XA6I6r6dUG[h&cAjUSAPI(dbhQEPDb0*+mqX6fN-*U1*9$3@'8GN$c0%(%0
-
-GelfTH&Fd4Q0)jLrR%MNc2aM&pcf8d``Y,Ak!B(cHb*GQH1E2Phb'JLQq0Yi5)P*
-
-IZ&DMccNrDX`mDiN1BLbSE&MC!)B+3p!!(FM4Z3"pmf##5,64Fd39&fA9Eck6N4(
-
-q-Kr+TK`qGQ`-&dGPAb51%'Q'J"dB3bK$iZYMHPIm%$'QJ`j8f2l6cq5j@TmTYD&
-
-8Dh0,2)CCjkGqG*&J+Y5CqU@IDmIQUUrh9q!`X*4GG$59b(1#DBYLrXT3Hc`B6B4
-
-D3NZ)Zr'(SNLFq4ETPX+0#01J@-c9Mci&E"ETe"lZK'B2D682F5pVpcl#6cM0`cF
-
-VIh2RdI%LA6N'$6l@jXi1I@kfp+LX3395@i-*Bq1p(FdBDS-m*N)0#&FB@QXXRJV
-
-TqHr&d$F[UDca!YiDjchaf-C3%T1`bTUFNM26%1V@@T1GbH#dKP"R2*d-KU#5L)D
-
-5FVQ)&NXr0"XEY)Prh,6j`NN!Fk+aB(Zk*F3lDTZ$[P"c5bMC1Arq8UD4i#5T15f
-
-KF$3@iP2*G)M2RB8&#LRFh0iTXfaMT'5S@aDD8))aK6DZ*"9[2BV(P+51c4hG,L+
-
-c53S*k44Xa8Acmd49U9R$Xk-p6,4P'e,Rh4bZH3"e6"(G$Pjab5Ikh&MNk*3JKBH
-
-am`[rd,p4KJ)IdrpGAkQ!SYrdArSB+K6p(4q-kaYR%DeiK@MHTTrT+airpFpf(!c
-
-C6D6hMrH[fSGq[SpSi@NLdj2ApC8!q05rrM0pH5A%p,FGr*AqP!RpYPrTjl,kIr)
-
-Mrc0p)kiXJcl9Cb(1%'6hP`BRQ0MP'EU4U`lF@CCrSLp0(%#3!"HAp98B52*lSGq
-
-&ZrfkrM3CD5@kEp'%2R+m!*ldPFM#f(9p0R-`C#rdT5&)cLr`#Kk#rMULrlIXZ[j
-
-d'6P$Y0N+!(Y!54rDdc&h'$"brDYqB3l4$[hhr$0$4PE$2eXNb2ieb2fErJLM)1T
-
-RZCa*(rQIH68r2Xk[*I+#iKreEj!!r52r-kc1XRmYjSpI3ai@B(RaKIqI,BSqG$#
-
-E'MkH69X[ckB'iJEe$Qi`RhhAFB-&cq&lKKZFKRc"-D9m50)#'Z6Fp%2+jFLffS0
-
-N5Tj%4@C5"GI&cC(ZFcD,h$e838lFZmM*m-eX'F$dP%A,,mqff[SF8$&N-KPiM91
-
-9NF2XSa0J@f1fH(J8"hGPCVYkTSRLJ,V55r6R486P'%J,"U5PdFrVi(p*UM20Z#1
-
-AjGIGE[0r"EdLeqdcjp[mNSplX,Y)hCYJ5aj0I@@G*jb-Gm65lHf-'iiR1d+aG!I
-
-M4Q-YACfKpTEfZ,40CpQLY-XkZ5B+lNFp6BS(cVppFXHLm)JE3biI%jRZ4TD29iR
-
-SY!R1P$QEBbjeBD*lqi'1GccMbIje'bEC1H@a56dI1a@*I@9pEqBF-qYcdaaAM`b
-
-5FjP9B(QLVT*e4Aa$'kXN*T*FX[j[jrbLXcJ8Me@X&Eh%AL-JTT!!Gd4B3#S&rjI
-
-6(0UBDSje*M'BT4+G-9BhC9*@-5jcH$[1@!XpJKl'$ZGDCHXmRb03ICB4reapCC!
-
-!(Mqj("6&rGSNfp+B@FQGKfZV'cfXb6ZLR8&V%2h"l5[mJ8hjJPR%eT0&kPUA"r-
-
-MPcHq*D-)FI[,GTp4[[$$5jiqJ&BGP+G#UkjaI6!H#dFM9NbNa28pDebXI1(,,(N
-
-ED'bUV!CChjPULFDCN!"U8NG00mXke@ZV@1Ge4VY$ke-3#PpeT"PAmJT`"+9)V,N
-
-pTl6IHLkVI,'RZ6PAIkpR2HXM[+GCRdK'0dVZpqGr6kpmXC'CT5KCd3'NL33K%LA
-
-eT(2pQ21Q5[3dR+GDX116UUkC9$)S5UXm2KGcINq`Y6NTP421bhiMS(ba5j&Vj+N
-
-6f#aTQ1JNeElPhNVPLj`GVbDV%DYQDdZbmeS[j5Xpee4GLelLG+PS4`JbeUXka[&
-
-k0V$H4$f6H2FMHFHjNP0bI"Sd(Fh4'2DERk5`R-%10TmaEFjrI`$I68b$mrG)kq6
-
-aHBBP*&LlQC0%8Xl9HQQfr9b!L@&XcMHPT*eJ*QI3,1Ibj`$iNqZ&q@YbPJ1Ha&!
-
-Tc3P+,rc(E-IjIaGE%9QEH@4l"'92bccba&FiN!#)&l6[jHikPAbI*GrYmVe9[[I
-
-)phhbr86Z2U8bGeIk!)'b%TGV)mAiNDCMGeGHc9GI%IUT&GqZ"BjUSA+ed+mA[-2
-
-LXC)(FAZaC"ZB'D&IrCc3Ep!"HarI&r!YF8GmAD,SLj2'YmVA4CaPLEK2k0IH*6a
-
-V*Vk$fS9GI4I"H5aL!-[(@%*ka9$HA3N5qMA()VUDA4&9YPT)mi[cZX*6&cM@eJP
-
-93VpZN!!h"R3P6RiqmI$[+mN)k3@15PH6#pcRH,qPD`T@&9NVUY3'[UeNf`)(%Um
-
-4l0h!LdSHK&T$P4pi$qrR04'Md+mkS'(0E3aI&)EejF*+mAAAd"56T5l"Ckd*lZ6
-
-dYG-("ec$9*M3CUehlN4&9Aer+0`PT+AR#H3GeRp3FMK[%pq9er8Y223JLKM!HEY
-
-N,mdU@jbA#DY@la65UhIkhK'(PTE4BPEM30kDR@@'[UIiiUc6TNIh["CTp`k2hPr
-
-5`jXLjbc1QSI$eZbmE28#KdHUPIB[)RkQV95-AKqV@,pZ+bUiLHmHp@@M''(eB8f
-
-f*6X2R,FYF5Vrc4ePeE6)rfDaf,5cCM&h@d69*`VTa,5qikYhmZK0Ble`+6c9aU-
-
-'$C(cf9ZKQl&q68LMIi$490Bh%PU%6PbL0f'aB1Hl9(X5aT1l$Kj@l3YE82GhXer
-
-JkbdqLcQ3!1Fk6iB8YmemmZL+iq,&A6dRGi493YT#@5[6iERXA%YphBr&!El1[CF
-
-+&dD44l1b0lLIpNA*b0Ie[@mhS`,[c9hpkT&bXm8F@aUa0,JLKIL@V(3KLJm!)8*
-
-&l+8LDUmD1G8`KVdmJ3fHfLH1XVUTHZhcb&J6TE``hq4Z-c@i`ef*B0pah)HB(K3
-
-H'HbMU6,f$BBChH*)C%0(+c3dM1IjL9Re`SV`bmEQ#NIi'&Lk[$Dk84behl,DCHN
-
-H16RiF'r0K2I@`Gr,ZCIaFJ8(9XVm+EKbPreGN!$mr6@mUF84qbhVQ,I8i-1$d1L
-
-YqD*,(#erAVJEVY!Kh&Y92c(6UfI+c4%lZQ4ZC'U$+c`cjjFl(c$,5(pJUS`F$5#
-
-EZE0`h)YZC!jHBaAMZcmFjCGm1&U$M9+Ne&j+T4(,h&)bVh&lrSC-Tmk6jY8epT%
-
-+KrZQ`[0dKhfNlm)+9rKGp,K6bKpRq*MNS4mHqT0LLL3I0lp35RH%Cbk#'pph)mE
-
-6[h0S,fP#'NXTD5D86d2hbhap`Y5EHAZ(lFME$j!!1d1fSr"6Rb5lf@C@BB2jcJl
-
-d"Pmq29"SQ8HDhKll%9B0qe'T%Lq*l`B@mDEXREcc)d9M9,K%USLj(+VSJHQqK)Q
-
-BUR$*mLCd,r",+)phKPA01S'YCFRQb(lRkmXX"TYMlpHHARDS*k*$hLm)m'`$`C@
-
-&''S*&!*9bDJjS-&YYQGB2'VT%G,Cl`MTLd2Sm'j5'3C),I`f)I@3!2%1,)HU+UJ
-
-[bkq[4qlc"L&GfMhFDr(rrZQrf[,p)kG15hMhd4&b@XV0CQ"E"aq41''CBqMY(fk
-
-6'%db`c6B2p`N-G`b3k2E`LC4PM$L%f0jKiiA$`FdZ,h'8JHGYGjZ,MFIA,hUZ$K
-
-Fiik-#KIi%CQcHi)c,(2FXEaGVJlG5DIV!UPX*XE&5&T'QM)AD5aPC#KEMpRZ(3F
-
-@d#@FcrhLGd[T9XjApG)IRkldZGhZJ5-RYrVI*)HP'-lr3A8KTMck#[J2AZG[`VV
-
-Jha3@r)a[((G3NfNVUYR5CUc-9'i"NmFYABR*P@C*M$5iH4*6"eEDLVfl+"l+"(8
-
-@M14#qZ$f$FE-%Cr66QkRcbQN$fhIF,09`KM,jee+2Zp$4fakRpHZ&p+X)mlfR0d
-
-"PD(-NB(YG[A4!D[DjheP`1FGh"ibp'lGS''H'jf"FrF4Q`L4&ES+2A+LQ%dj*8l
-
-JqAe2P46cqDAU"Zq2[3hH*IV!V%Q9RJD[$Y[IcD0hlLbM[MffBNarf[!E,'IqV1S
-
-aElL)9fHGF2%%2`0UDi(dPMEbbl2c%Kck4I2iE0i!RV[80kDaL&r1U`2Q5CH@"Lr
-
-[j0%0QdI,$*Mbr0mIb&Vl[VlL6mAA(hfaa#pj@9j6KDPc$R)3I@Chp&h`$&mbSC-
-
-1!RXIf22!RJ6fYm!H!,BEf0m"Hh*LCMEaT63VNSGE8@5Q-%`Tk#5JFa%k+H!Y`!-
-
-bRJ6HK'V%dHZYf,SBN!$R'c'C1LBRd`93$,0Ui1jQlR&I`LU#Zje9!2GEQ52F,Ia
-
-k)@hM(PmfejF`2MlEaQ@pYK(Kfraah#la*h*F5bXCXX8fMUr1HS@dXLKKFl&i-D,
-
-KRHjGikbVar'Y9la$l2RB6pmR,LdS'+0CVLaC,H`"dT@r%Z!F2cScr3P3LVMhU0$
-
-RDQ6lXmIBIJ6h2FZaT-(pd#Tr(GX$[`!BEfIS4+1rNEepHBe0*1LCXfaR!QFkYKh
-
-"[C!!E89`RpfiTTEKYhU%C9l5FSYb1eVZ[NShdqFHU(5[B[`[Xmd%lNp8ZZr%``V
-
-Z`-Sk2q2e,eY9c6DeamCH2MPq""hf),AJ0Z`'mAk4BHU,`2"fN@(D$$6B3eKJHLe
-
-ijh+BEJhfCmrNX"X@BR0iMP35pJI3b"!RLM2TKUm#`jj4mR%B@%X1Qrhh`&k8X3q
-
-"I82'4(M5h,f&[F[64H#l[1e2f"XKA3FdhPMh,0f#,XX(PR*-SARJ23cXC6*+rTj
-
-($GBeQHQ,U+Ad,JkXA`G[(hJpP*%d'S#PC1a"B'rNDPDX"RC'a[6!hT)eeX&I3XE
-
-f-%rDMYpUEQfrmLafmJQYmYTfr+%XjmL[Mpm65YCl'2rr!!d!#'GMG'9cG#kjZ@0
-
-38%-ZZ3#3%%0D!*!3(m-!!%+&!*!%rj!%8&*25NY"5%`"!+QdiJLV-$9B!!"5l3#
-
-3"K+K!*!%$I3!N!Me"!i!pCQCc1abX2*Ef-,&mj8EA@KjV4fRQfkf--,fZP@[Eld
-
-Z$dq2VmN'A5Bp-hbAY9lHAJFXfQdl+AG,Z2)ME*&GEJRrA-libQIDl@-,fic`*fc
-
-6K5HKhAEKE`YIq-)mEQiRK(pXXmb@iapGq-+kKCfFELT3q1c,IZ&ZXPf1@pl#b%)
-
-ffjdZC,)F@FK#&m,)B+r,!D4[CPq-FBbaqZ@-eH&@A,@%-I9,M(@V+THFE3i'I@,
-
-PFV%p`R[E)f,)lA5*'SmV)SBMaKm`"H(DkkSAQQdeb1%*lP8%I"Kcj(3rX&H6m0M
-
-IZTkaqjrj`UCT$PZ9X*!!V`m&fSamV5GNj#ReR!CAb"Z-H0XpDBqF`ePa(%eGaiT
-
-)S-2EcP+HcTr1B+bXmm9Kh'q$6Mf`X[$"KF4R$RhYV2*CXk3m49H%V`fdL)`T"cl
-
-J+-2j13Fpcq@-E8&E8'&IE%H%!Ne3,pZF#1HDf2Hf""Q,&l1('*Yr8%EphJ1GXSF
-
-r%JrNr)3rGBV*(aq@mf,a)FC8Kq$ER2+`6KCr)B9h0"r'+0,%0Xm[rQdqSqFB2cQ
-
-eBU69f4*S4krcbhc8LClZG$iIR'*cIAh0I"abUXM3iXkAEq$(ilQ,49r!j3f+,H)
-
-maNhp56c112ejNK@"P6JkPXIB&fjK8aKcR!drZX6iG+jqq&li[TdQiqM4U(!CR@&
-
-rGU+(,&FBA8QAdZJ+kKT@q*eSAPdm1Mm9!Sj'C"RE!a%aQhqm(IAaK-)B'-FE!ha
-
-jS(fj'%,(Uc#'FK,*f-@9@FC3113DEaI$J@M)*3)Pk"9$i'!+Qm`pccf[0,(*#J2
-
-h%ZcNS8*JE#k(6ij38,[0q$[cVaRB"FIjhRDA,pSLmUCDTmXQ1P[%8(M@V%X))mK
-
-*81HhL'j[ZmK(3P'46jb,ab@$h%jI@)iU6J@&a*8bd!J5%NZ'TC%NDKY",5%K9lA
-
-%%1kQ%f8Z9IE(4kQ5X*9Mq!UPK%dirih2+53-k[E(m!QELQ!-Rl#ccq$6B)6Z-I`
-
-FQ(52iC0Hd6f'2a&QlKPm`YDG`5GX%V)aI-*'%r+rq)3prJ`qB9260)C2f"21i"-
-
-feI!B2QRI@@I`#A[5'Ic*-1NH`dIV+GeMrFY8Q(52j8mG(mdXar#TGUKe(X1R`pq
-
-T1G'EYSlfTT4IFZ446jL-RfpLA2G!eYX*@kf3!1dTXPdLfkfbh5AE'fAlbB5G8j'
-
-`4rJkCZFXKT(SUhpj-0jKc0+KVIl1dd)2DmAG-GY8*93X&AUb"HYJr,'#0E!H,EJ
-
-1NCe#Mr)KS8HMKZmGh)rJ,V"iE"haZ#h!9,BPYJl''HE&0`Sp@9F+$qSClfFqB9h
-
-h3F6FlY%JbNC43[653pSVJdcS86hQ89H[mbKL98+8Rk[YF1I00PeH*e3+2HTqAYH
-
-N,LMMCc%HqGX+1SASE&1&f@&'l%0mMD%M4m1VBND`e)EiiS,VCTXD(2B'40m'rl5
-
-#08#c9pE!hmAAm#U26ZK4E&E48%VR2LJ-CTF+Lq-[Q!rPj"[UJRc-'14f6EKm3Rq
-
-[HC!!63aQaBb,eS*44IHY`T9#9"TN-1YJpRX&fl4AmahDMZpMp-1B4i1Br38Ef*5
-
-LZGT1Yf,T@L'kG+hYpILK5iVBA1+i5A[CfL*0plhmp&KCF6DUCir(CadF[VkJLmr
-
-hl$189GrN0XCQaUTQQmSPVV*HpY33GT)apN++X4le+M"i0Epbf"EcSZR0GUYL,E'
-
-CL0P[#,$5,pp39-AQe,`b2HjB@cfAZmLMk)i,dH$ilTe,er+S69fpF0LG9mb$!l[
-
-R31a#i(BDla#LU"ri@"l9MH5GKNUFPjh[CUb%le$F&p6Y@VGPQf+Mf`$HhiaG`0F
-
-EE!CpNpCmJ'NLh(AkA6XZh4NrZ+jVe`eZK4!eX*L4F(JZ0X03ArHcH#pICpR!*Pl
-
-XK4j0L8ffh'rc-KeIere1L4i-[$eMkE2E5r8'IIXP(S2Gl*Q)Zf#a'@X,Qq&K$)b
-
-8&-E"[@,S'A[+pp5)VrqCMI&KiNfa[Q3Qde9lQGE01baYqAD,Zb2SkYi*qa$K!H(
-
-QrQk@*rZq5ckG*6lNDIDh!N0&FHA[kK@2A1Tq5ZHFEh)rKLLeYSe0M3qAR,I8E&J
-
-jY+[rT[A9)lQhp[p4)R[CAjVd`eG)q5Ap59[1Ed$+lfq3!*Xb2P4bhK@8@k6rTRj
-
-JV+rq[$NqA2U`m"9NK3VKAUem9mqHIDj8lbP"PFc`j0R0lNQ*I,N$6AVCdp18*hY
-
-f0%'EZEh)H$fUN6,B3ica+pmIjZHp2ebp!DT9@&,)#Mf''B9-IjQPr#f@rm`"TRV
-
-fXT+Kq5E,f4-2X#q@$(82A'Tf[iND,j2dTmcpQ*4$$h,S#F8M6-VMR%F+f4IGNqB
-
-J'pZ22,VGhpLkJDP%PD'3!+P'N!"h!rF@[MkB[ljcr`h&frIIb#bGV(J(mUN2X4*
-
-pX9j4GNhmp4Y3'hcTK+D*KTP-YEkVC$Za8E*$BZ+*q*Y0FrMmf#+ql$LLcLXFCJU
-
-2[K5SU)%*YQ!q)e6KX1%9i!l`mjL@,h-VR'U"@M4@E)Vpm1i&"NfaDF-GpbrBfZ9
-
-43qpR0r'kZ8c&&BRN0640K&FKHr90+PMRPJr'GaLkK'MXKd,di#&8q%UQd23bTI"
-
-9"Y@$aT[+kbSUjl2Z'0pB$phR08+dF1AJHN20YhDrGZhcfjrC,IPAlKKLCBC5[4k
-
-q9Idh5c&Z18Dc[QH`6BT`b"(jr6f$$LR#)NHSe0H#a(a5Q2KG+Ee$aFHh0DPJl5(
-
-93@8ePZK,p9Z@,YNC(kbfH)D&!Aj)MVPY*'C3MV'dDpHCrHTGCHB"TLM1TeLdU%9
-
--9@4Q+N-4da3eSVGlhF4QX!,1CRRd4iAX3Xj@qF4Il+k`@5b@hZfl9Y@m`Nb'kFM
-
-m(e%[4TI(rJ6aDdl'AmecRb,-rM4HPmkJZV0Y@[@eEEU+cSTV%FR$LPDJFf96T)J
-
-SBV95T"T4851Qcr(ieNkAfS!@ABKZ@GfXkpaZ+bYKPM*EQ4$GZVVj(+2NSbLEp4*
-
-QXhjcHh'fc9U5,85T)[CflEd"+)FkYrHZ,P(Zk$8UEGDRHfh@rY@LC[fUCKAPh&$
-
-@Y1rVM$T#D)9kIMCdBMTe139Pm1GfheX`RFmY90UY2l2DVI1bQkD-SR6CVHVV',Y
-
-QH0(D)YCpAr&dG(pClTG)CrkkmRDVHaU[M*8KLl[iXi"f16cV#a[iKE'C33leSVV
-
-cA&k$1%ZK,B8aKer)+j[dSeNDl&DqM%FeA$0FT%'A9r0mEmcBIIHPIa9riGZ2&Y4
-
-)Z5bXVN6AH6jd%(9@BZSH+"mmR)p+fJ,I1r!p$0mpm2dGI$I#GaYmI`rI25-pFcj
-
-Ib+CiY,#QH5B*Jb`#R#"`$J)R!Rm,r%fb2`5r!f`%81ZYQ*CVS1I,dCQD4M[6f8"
-
-d%aZ`,C3pl(R%#1`5BJ$fKC34E!2I+%5,Z6XAc,!&GAHH@mc&V-9$`JriRE!1mdm
-
-QBJfY6"1EAXca96'V%%d15UJ[MKrdU2JbblTde+I(r2fRV)GU*0F[GKFZ'6FZ&@C
-
-!@&e$S`1V*BfZ3,[Ekc'f'QM#1TGaI6mfFAd[dRd&lTYa2mhe[DcQqPkGarAYVFD
-
-pRq[EGj!!kh[Gb2@pdFVerHebVZqYjlLqJ6bZladIehI`(Ul[(a4Fhf(J[@rMqRk
-
-qJHZ,jh2ph!,FAqIkPGrNqY@YA,rQDG`$A2piD5R$)dE#I+49a0+%1a6`miQp3Qa
-
-bq2hBFJaMcC%A-H[Lh9kI1084#2JDa"!f3ALEk![b$C%30K$$+Rp)$+Z#lAk4M'@
-
-U"BZ%FY95Keh3%Y-m5!m&aNNZUbm3$MY$+e3GhSKrHRQY-ib9%UaRb2XM&r&Bb[Q
-
-$#1m2Y(MG+riPr[FUR"'4$dHFrL$[$S4iX30Jl8iIhq)0r5khhm926M)p@LJ6T9)
-
-i'P,4l,[)jI1kP[&L+-6l`aiMMHaaP!k@(kR(!$5jIF64)2HV9c"fkm2Bb8M[NA,
-
-5*ahe$KKB9T9'TSPBKI4**`H4UR2Kk*+M&9J[`FHC*Q&NUD#pVUA83F[45Jadk'0
-
-F3Yf1$dpTM65,Hfl&AGM3!#1U'a&eQabGKF82I&eA%c-D$%HjjT%"U4TMFAb*[&A
-
-h)@)HETXFRBf&$h`V0NVHj1U3!,`K#cY(qL511H*j`3MI14L%iN0H')LU%pY@kEb
-
-e@+I!ap@!&jDr$K6[395bNR+a,%&ISM6!LST@Uj*V5MUX3Y#A)"$4+kM@NKY`il$
-
-S30pF$R`T#q@S*(BHeKMSieHp#Flf)`,0AQTaDcb@&2)PHQQ)5fb5Xdb1cXF+!Vj
-
-N8DB2,Ic5f4Kjid'T!M!XRlE0,$48%8&NcjVeLhiPLG[pfVbedR#BF'qX0CFl+(-
-
-SP#2N$)DCki1*FLTMEYAMF%qMfLlECUkT+5IZR$kIUlACYmcS)YhC12(&iZ3YB9'
-
-@5Q5*+ZHdkID)X$BCAmp+hXKTKT6AHm#U3r4C*hSQB(BrU*ZE[*&EJ[hH"NF&f1H
-
-b`j%@Ei"`&+-i5TRYhSDUbbZ*lE"hTGJB!9#%@0JA5pj3Yh-5l&V,'fQFRq0a03C
-
-$hZ956TYb(mp1hP#k+8NN)bQBbZ-#L*FT4c0ATc*h9&5!)3dB`XSCTF08SdMC5D3
-
-Pj6BcCAk9Up8CNNK#jN9IDNVH8!QCSr)k39+0G(N`aFD&eSVN$99-XdNF%CZY,D(
-
-`"a@L69D5SkS@&F+T)ekr#"MM-CcF0*pfUMM`5Hd-*A450pjlk`mPT8VU"Y9h0R3
-
-Mi#,4b)#J'D-9V[Mh#PIqZX**-8jAH0BrUp"aT*4UR0)#8Sh6@T!!8Se6@T!!maX
-
-Yd(kN"FGd1[HIG2TA[3DH,8Mf'TBDXp4V02ZFVQ8q2,U3!#'KemM%T"XRp@#KVcU
-
-Y"q@f5Y+$A#aMZCD&Srj`4S3qiL3hckljPY445pa8@+b09#FYcCj'[bpc@BGcr'Q
-
-!%69iq@)m[C*8URU(RG4!'ib%'PfYVS`*8j,-6"h[aReIXbG[D8k5c,e@cYh[$#h
-
-lT)pilFFr65[(JLU"+N',p`QF2Y40KM[Pq2-plHN1e&CT4R@a((P61@0C"rU4'Q`
-
-blVmMh8FNDTaTr9MRD@`4JjR-qSM6-pGM1,T84T8160L3!*%BDI-(2jh'hIh8YR5
-
-r8BZ42Y@"2cR5GhfQ,m$+0,B(FZ(*qFCchdR[JG5Dl3[K98[0EFBhc6Jf!k'Hj$p
-
-R)(rUIIG)ebZT#lVHd,,'8%3DJQ5UfdlEP"@LKiU5A8P9!ff@U2hH-(@biF`FQ[(
-
-KV+6++NJeiI9JS(a#A@K@FPTGe,p@Pj4QR&)AdSc6kT,5M&2U3T15dqU5QT4mULl
-
-T5FPrl#eaeipXJ`L95k4YN!"fmDV'M(FlXp`hrMJpBDZc9%XlCB(Q0M6#dJJhdpT
-
-%2bZdFd30'KTT[d-6#2rA22prCQFCZHEjar[pNj2C69PYp)K@DM)V+8'fT!3C%RU
-
-0$!Sc%%F&0K8NII&jQb@NScQPp1@%DKc0DD4,rDbV-ccd@PV(lCAPY$H4%a*G2UI
-
-ARl'MdM)(c3+5MpDF8)f1Rr4*kNc)faB*9I4DMcVDlZfJPej1UXfAEck8RMde1"C
-
-Ci0@')p(QjN#S(A*Mr%a[J*8"E)T3G!%pL5YhHBl+"RVj4bhpa)5,Y@G#d)*M[FH
-
-rp@3IGap(N9*kF+TlbrUSQrlA5IIaD[aidXeYj&CVNMH83&CM+!&9RaC+%&Q"[`%
-
-!PM5C'9(,)ph(*fUTr9!YMqT9DV2iP&iGfErj4+r'r8D[mMkHFibb02iMPNjf1PA
-
-[d("$VLh(CI8d(p1LX&VN*cJbP(8k[pfF2kE#ZPqTX(51-%LC%ZXU[a22)[*i8[E
-
-rZJ[cIcUGL4G#pHMBk,e2kCF0VX,2PP#E5Iik[#T1$qmHrqXJc[6'Fa2`XLUETTM
-
-$*YV-$D3cYp12%m#qEb(qhJ$feL8eGE5PqJMF0!YqXU&'QZAY39+9b(8[r8`"-MX
-
-Ah$6![T!!ITF!pTb'bfV*EbNA&PMaKL[H#UA+i@kTX"!qGeH&C3R&EkCI&X"$k6d
-
-9PN9@f#m[VUY"R%+aB%N90%@4PhahPUZj([c3IkY-$A%eUr''+[Q8"m(LQS3[kcE
-
-1G+!PiF[1j8b6mBiYqG4I![EZK'rFji"Ab"55leDmdYV+9*,[$[MHa&2kj,XIH(K
-
-90KkIa-Ep'I$!Tj5(&h&2b4cN`,G2pSf$$kqZ5Vi*m(hh+pHLCV(B#pqMEAp*2`L
-
-K$S-ce482X[1!F4&mDd`jE#EL`-(e-DD6q,X(FCd12IXm1+#IdU#-2SFi1q)HB*d
-
-54KI`ANVie'C`8jVJFZTNa%85A%ip'ebqP1"bkZr$jj-acJ0'8-Di!,i@'@-Q-2E
-
-*q68KTiMXZ`ja[9RqCFj@hp%rG"RpQjINMlqNrpQ&-qA@"ki53rAP&2rr!!!0$3p
-
-YGbpRBh4PFh3Z0MK,,VN!N""453#3%#pd!!"+8`#3"2q3"%e08&*0680$!3#V,jH
-
-ZUc!jB!!!"M%!!"R%!!!"V3!!"E(*MaZS!*!'[VXM4!iL+Pj0j%)PIdhl9fbRBC!
-
-!DR1(JAFp3hUJ2KNcZ@(k&LeHlIYc*cMM1X2GRCf"!*`N(81C&iAQNTm4&Ifii1"
-
-EpGII4h6#PiP+'R-jb[e$&IeM12rA3hh-XBk+D2XK9#@U!P9e!@eRU22XRT!!%ar
-
-%6jaP3[FjFKhiIjQ@hidE$&25cAm$`-IrIXai*1U*jZd88q%pXX1%F$M`RNJbAQS
-
-ih%%N0J*@A""6p[pE#%1,cL9X%K8j[Z%i38$F)*'R%8!QpTQQT&06TCMf4amme9+
-
-jii[1iC(HE43E%aa#QlrCjZ4[GSL(8*!!e8D-E"#r6LR@&GN3aF6F'028K*cdTGk
-
-aT$fkUhhK6F,P(Tj11!CFTLJ+QQSXDINp,M$RL-+Cm9q6j"VK+Hr'rhrjXB16b1@
-
-iec&AC&Z,)bAP)A[QZNkT`brFF9bj0@L(b*(4H3)$i*YCbh9`YK90aj%$0a!Gm&!
-
-,de[B3!XlC'%$"-Eme,D0'(Z229-8DlB`9Q$FC!Y6@9L'KA%@PQm[")V0YM#PKBP
-
-$[mI#m!L#i#MfjAH50i4eE512Q3bj@@90I4m!N!--!'XcXfpJlh2Ij$4lRaZHF-P
-
-a`Tr-D)4&@%FjIAiV9hi5rZ3i@3NqRhV5`hI'm8m[3MNjENHi%AjN`!NMR"`rbB$
-
-bTrc)FA,m$%r*F51Fm*03FTa`FTa`-Q#%%hlN'4R`Pa`RA(+FF+mMamRa)mq2m$2
-
-#bB!#GjN8B'@Y6-+0iUpN*rl)-F)*2m)*8[#%!j-9H"9SN!!()1QkKK#+`Hm@K$S
-
-HJ&m,rN[#E`hmIJLEJ,q0bk)PQTCS@&q4J@q@4d"9U,FU)md-(0Yrf-'kLSC3Ech
-
-QTZ6PDfM!,6kXTJh48"8c3%-B$Af2ZR8CG9Ip2$-35k-p#&9[4Zd)$4`EE%%G46!
-
-,R0"9-23T99CN34j4,-#2%@HJ4P(6T'aDQa#N[iMDX5G2a3J5j8hqU`G8AI)J-HU
-
-[2pc+8DXTel3Q5K1DDDe`rC'MeMLS#5QV5"2QC-jFKV@(Y,XiDUf$'TI6Q941+fY
-
-NIrEXmabeMLSdTZC&6Ae8m48krm8h(,@HFXdUSU`BRMk!q[lRHBlD3,RQ4#QENT@
-
-#"cXRI2X+4ie6jif)dMfM+mkEUadrc9%E(G5'h+TKlGFqRHHS#3He,LFDrPe`h($
-
-QCBlDa(3e*P+'jG["RP9riDM0,PI9V"`8d09SikJYP'YH1C5kHVfHlZ'SDkKIpI4
-
-i+LIkaJ28)bpbe,88e9!N694cCG6ZNqFjkMUUN!"T6DE6ZT(h&AViKGmikRVU"NX
-
-TAdR(H9q1FY4@bY@D,XL9SfF2rY6286HiPp,*+'9G,aJIFG50p#Uce14Gj3Y'd81
-
-Ek"h5cFV&)blrQ+1f8B8b8UTJU&0#eN-9cVh+8GXGe*U-j!-kU)P6p4b9*UB'dj*
-
-PCDb-E#IIrF$K4qBkCkfIRK)eFi@ZrFEXr4ae-h@$T1I(e%`C&K,!AUi3T&L#1U`
-
-I'P&bCG3h(rRp#Fje+d8&50fBrKHeFp&j@4Q5M3GV$pea1eGSfk+(0$9pa80R1GF
-
-ZCkfce*a5FDbGI1mKMRSpifUSq482fFRj!BlD6Id+#UPkaDr(MfcMU0YGVSSeRLY
-
-8Z0V[F05H43q4)19lk0aM"lL(GMKViS"LkT1'T(MH+rPeTkZ3!*U"!([&H8FjkLl
-
-+0@RS306mKfX[64ZJ+`31D"5@fGUaCaUiVRd8Y@!C+5NVP42Ef6h&a0E[S,D5e*Z
-
-k$e*4k[,4R"1qUq@S0cKV-k$Hk86c@fiEqT2V*rYSlLHcfePEppip1YM9Hl2Del9
-
-2!&`"@TQ,U#F1&[Z''jdelZ4b1(ZHmdimH"0(45eR)(&!*q9f)f6q6PCX0VTUBad
-
-IAd$pf!@`[ik1Br'KUlR)+fakrN"cHF(H36)2h%jb&H(+NrX0&jMF9VMIj$*$&L)
-
-T"p)0cLf`Yq1%"AXR6JQ`Yq'FKMf0GB,GdbRXPYLiZ+lq4#IBL8k`%jeJ*cV"6R5
-
-#RHJ%1p%*GU)6l%3Rf)P1h%qc#+[@Y15RS-eL8qhT&"fJcd&k4dVkK,dC'pb'AVi
-
-MRZjKXmB'HccD3(IrcJ8G(KYmfk)&p1R"5Hkrqa'fKQc`$Bdfm0&Ek'dF5*Cm&25
-
-6E"T+qQc(16M5i"iI4FpKHCCb3p#-XSR6I3[1YF$(e@dVrAm(hAhGA,f#1a4fVQ`
-
-D)a0bM1IcX19PNiJXd-QrQrjp$rTP0Nh4$ljDEE6C0*GdfSPEQNJ$[AaI"9dkQjE
-
-)"&rjZ5PSlpQXL6c)65I42'&jkHi((6HE659pGY(F%GhJrk#CBp-AQC!!QcfG`RF
-
-BE0C'2GbTm18(Qh@4"hI+cbI"'a-fkb-2I05,Qq*VI86`ZS90Dq6"IEUNPpZrZ6d
-
-IkmP@hp@`f9$5UmK,"LjZ2dGjKIdd'pTRSrf,Re6[[[HdcbYXX0R3aK[KcVI)#mr
-
-A-dm"R8jJFcLjAc2T0r!1Xr%Ph(NRKdhm"Y1PM9qd9#9(PFc#![X)[SNKr!e@jAm
-
-!N!-0$3pYGbpRBh4PFh3Z8&"$,VN!N"!4c!#3%%+&!*!)rj!%68e38Ne33d-"!+X
-
-[PkkV-$P&!!!'-3!!'Z!!!!'T!!!&bE5F%03!N!B"fL0%$L)UANhN3L9r6IYAE+G
-
-KN!"UFiH"Gce$HU!q'61jBIV#iB$[cjhJM1X-GhH'!`%ib6Q'-Lm+c58r)bVkFF(
-
-"YqU[[irS4$#9MENFjIkKL[iaR2rVS6lQ@%G&Y2d3UK*9JDUkJ,Bce(Pf6fJm&6R
-
-b2Z8HRJiXa'A+ir""h#2TreqK*11PKX-G4'@dI[MrP@fl(cXiL9b1Haec4BbeKmP
-
-aeJj"iNA$iL1d#Y1J+HR89#QQrG%86l98l[LLFhLNlhad)NaL2JK&0pZFr-d1m4!
-
-+XYS)fcSm[diTeKAC%-A8h"M6e)5Fp+AHXD3p1ZNm1FY%rabj$[`E!$0bi`E$P26
-
-rG@!p"$aQr-JXH*CjLX,-Um9UPGj1-5VH)fY@`*(4VHaDSf,&r6CPrlq&--R1K6X
-
-*#r!9a`Q#"HZ@0$hdcLR&Z$Fm-LN%a%6I)NG'j`NF&EkCY9`(CaX9iFL4(fpK!IC
-
-B8#c-*P,XP1dG-@D4KE%@0XR#9"C'PcdhhF,ZXE"3#eYVB3-&a[CDHNU"FB-@YXI
-
-#PPJD!bcX5f0T(aH0)DaV'hR-C-M0+Q[Uq``!Da0l'f3fmMSr"jhCCQZ%N3NRNdf
-
-14LJRP"rPR[a@3Sqr%8D1NjAJmk5Hp2#G-Ic6Le"1MJm)Pachb(2###I(6c*J%8k
-
-j%8k1RiHRj,J46[K*+$P11$P11"P3`JNrmS`-q)!-Z'6!D6eKj2L4C`f-F$+J`(8
-
-Q"D$m9QE4e,T1r"&qK,q%%k6J#3FQ+c!qS%%HJ+LU#N)S",rE%'S`i2Fjq"D$ha,
-
-iI4qf+2P[K53BJQi)Q['&0I#IjBQL)Y4CP"42pjcUHm,'ZSf'8'HBF--Ck@qdLS0
-
-b3K-d'HXH'L*+S#ZS9C93Dp(hThY##E32SH*'Y!@KRP2p0@MV!TJ"6QM*DZUi,'%
-
-T+JeJ!r"$PM03TD!SBLUKM%E&Qd60d0-c)3Z*mVDqK3&9&I13!!6eTfr[iUM&P'Y
-
-#%F4446G@Z(l(88YXe)LB`Z+S2TE@Pf(0!mTp(,A84Uf3!",*H&STD'4qmZcc(,@
-
--+M3XC`4&IJbl#Phql%Z1'UCF8eL3!,#@e`G3hrdd`e(,+GHd)+EL%XlQBDHLAlh
-
--85ZSm`B%mB'K&HG0PBjFj+L90QTjHXf`jUXI6h28L)eDPKBdpblBE[Mm*BjDaA6
-
-94Z1DiGV"R*4rj+M9$PGCAcdSS+ZfQD2@8+iCI$4qqhSpdmj4DkPIeF4)2#fiaJ2
-
-8Bbpbe(889F1L)XMT!QVVKFXFYBiUT"YMLB5UC9b&(RhKCikkRVV"`)8VDEQKZf-
-
-V4kfRA)f*V,4kp-cqUedFGB0c+Hf-8Y$eQ[B"4pe)Vc*,6IQVI%eEm0!QHSG8IIA
-
-L@5lrN!#MEUCQhhrr8(p,Ec3@kie#4,V"pIbK)a`9-T!!GBlk-`E@KJ84,f%LG'i
-
-f[T!!!'KLUKNie$XiPM(N0&lQH[KU'dGYS"j+L['X*Sp(8hPGSl0R1'UMM9U5&&e
-
-!'c8b%qDSN!"L,3rTKL6Ki3+b'A[l2CZI0G[Y06`a,LMk#PhcpFQ(1'S6pDZSCSE
-
-PC!&fUR[r&Uj3-eASS(Td!+F,U1H1r2)8jpT#83&5e5EZS1kBGej+JZb9Kc82h(-
-
-h9kKehN1+R,MPS8ZFDjZpPPPABF@aCZbG`abeRA(9j-b+KmcBG!p(lD"q"B9NGG@
-
-[CimeFp5G$PGXM+5cUec0YcMUVRN2@9(2pG$Xii2F3jhf'KR%ZMUQL6M[[CaIGcX
-
-+b8Q)f,HFGj+MGP'Z-8d&S[SrA2I32!5k3L5#cQ1CV4NkAXjer4pehS"JT*BMJmh
-
-eq+jHMVUAFXdD@Pa-LB8NHQRI3K)PI3p-0D6jHqhb!-,0lkJIrAq#kpTYIkZh1S$
-
-iJj!!%H0,"hSUqR8TjiTU6d$LH!3qd"l'QVp5(*Z0MQj%N5IR8$IK#2YVk#b4%AU
-
-KAhRjVG*[D*cA0T*HB1mJp`hf9R+*B@mR9a,f0R*MBGp1mJVX655"`0j)XK,X1mL
-
-pKlf"*+irG2*l,$B1E[#"6T2S$,#X@[56ejba+FlV&"bJcm2dMZ6dm6Xk0U4jAES
-
-MHGhp&Sp0DH#"lZkGmrT#0Q@"!rVX)TRXhr[K0j4X`S%(2RS$[3RXDKCpj(@KE-T
-
-cqZ`NL6E3i"kI4160319LE["D@$B9G'mQ#4Ai1,Ued1qGG(GeFr6blT!!hqqbU3a
-
--b$&jRrZ0-TY)B)&1lYedll[ACE1T#Rl`e9TlcUBkTp0ZdVF%-H4Z[lGR8a1Bi#X
-
-h0hN["GM8"KlNTJYSfQ*jrHjlI6UE66PpZQMZ#'l`[pH@XGNEQ*!!Qr-kq@mqf+`
-
-,HVK6rLX60R@""hI+c5IHHaBfk`-2I,5(G,jrpK(H5aSfpB%(pqQkANlrj[4mV#G
-
-EHm2$CN01V`9H%R"aqMR+bhpj`iDqe%&p8bAIR!qTj%[4$kpFY(MK'lcmYcPXk&Z
-
-H1lcmlTi0lIT[mPVbJIFUL!elGjRM4BM8c8"+#$@"@kr%qK5GrJGH8d5JeDSp%6Z
-
-S`aY94TZmpLQ+$H(Nh"cl%r`RK-KrL#Vr!3#3!aq$!!!"!*!$!43!N!-8!*!$-Tr
-
-lRLe!rr#`!,K[$#eZd!6rm2rdd"lm`FAKdkSV8FY+$deKBe"bEfTPBh4c,R0TG!)
-
-!N!06594%8dP8)3#3"P0*9%46593K!*!BUc!jI3!!8M8!!!&'"1"2l'mDG@6JrHc
-
-K@5U#NI*HN@GK!Z"2kQ`FG&2UN!"S!!,L@5[48(adA`CdC!EJ6qj[8hJS!!EJEHl
-
-LEe5!)D$!FJC1ANl!*IrX51FI-#D`jL63G!*&0K!+1Li!&Ri!)VX-S"lbUKQJ(Z`
-
-3!+SDI!$!#3ZT8,aIE!!!Q$!'8!6"aG!!N!-3!#X!"3%B!J#3"`-!N!-"!*!$!43
-
-!N!-8!*!$-J$j(l!@#J#3!a`!-J!!8f9dC`#3!`S!!2rr!*!&q@G%'@B:
-
diff --git a/boehm-gc/Mac_files/MacOS_Test_config.h b/boehm-gc/Mac_files/MacOS_Test_config.h
deleted file mode 100644
index 4e5d2527788..00000000000
--- a/boehm-gc/Mac_files/MacOS_Test_config.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-	MacOS_Test_config.h
-	
-	Configuration flags for Macintosh development systems.
-	
-	Test version.
-	
- 	<Revision History>
-
- 	11/16/95  pcb  Updated compilation flags to reflect latest 4.6 Makefile.
-	
-	by Patrick C. Beard.
- */
-/* Boehm, November 17, 1995 12:05 pm PST */
-
-#ifdef __MWERKS__
-
-// for CodeWarrior Pro with Metrowerks Standard Library (MSL).
-// #define MSL_USE_PRECOMPILED_HEADERS 0
-#include <ansi_prefix.mac.h>
-#ifndef __STDC__
-#define __STDC__ 0
-#endif
-
-#endif
-
-// these are defined again in gc_priv.h.
-#undef TRUE
-#undef FALSE
-
-#define ALL_INTERIOR_POINTERS	// follows interior pointers.
-//#define SILENT				// want collection messages.
-//#define DONT_ADD_BYTE_AT_END	// no padding.
-//#define SMALL_CONFIG			// whether to a smaller heap.
-#define NO_SIGNALS				// signals aren't real on the Macintosh.
-#define USE_TEMPORARY_MEMORY	// use Macintosh temporary memory.
-
-// CFLAGS= -O -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DSILENT
-//
-//LIBGC_CFLAGS= -O -DNO_SIGNALS -DSILENT \
-//    -DREDIRECT_MALLOC=GC_malloc_uncollectable \
-//    -DDONT_ADD_BYTE_AT_END -DALL_INTERIOR_POINTERS
-//   Flags for building libgc.a -- the last two are required.
-//
-// Setjmp_test may yield overly optimistic results when compiled
-// without optimization.
-// -DSILENT disables statistics printing, and improves performance.
-// -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-//   altered stubborn objects, at substantial performance cost.
-//   Use only for incremental collector debugging.
-// -DFIND_LEAK causes the collector to assume that all inaccessible
-//   objects should have been explicitly deallocated, and reports exceptions.
-//   Finalization and the test program are not usable in this mode.
-// -DSOLARIS_THREADS enables support for Solaris (thr_) threads.
-//   (Clients should also define SOLARIS_THREADS and then include
-//   gc.h before performing thr_ or GC_ operations.)
-//   This is broken on nonSPARC machines.
-// -DALL_INTERIOR_POINTERS allows all pointers to the interior
-//   of objects to be recognized.  (See gc_priv.h for consequences.)
-// -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-//   usually causing it to use less space in such situations.
-//   Incremental collection no longer works in this case.
-// -DLARGE_CONFIG tunes the collector for unusually large heaps.
-//   Necessary for heaps larger than about 500 MB on most machines.
-//   Recommended for heaps larger than about 64 MB.
-// -DDONT_ADD_BYTE_AT_END is meaningful only with
-//   -DALL_INTERIOR_POINTERS.  Normally -DALL_INTERIOR_POINTERS
-//   causes all objects to be padded so that pointers just past the end of
-//   an object can be recognized.  This can be expensive.  (The padding
-//   is normally more than one byte due to alignment constraints.)
-//   -DDONT_ADD_BYTE_AT_END disables the padding.
-// -DNO_SIGNALS does not disable signals during critical parts of
-//   the GC process.  This is no less correct than many malloc 
-//   implementations, and it sometimes has a significant performance
-//   impact.  However, it is dangerous for many not-quite-ANSI C
-//   programs that call things like printf in asynchronous signal handlers.
-// -DGC_OPERATOR_NEW_ARRAY declares that the C++ compiler supports the
-//   new syntax "operator new[]" for allocating and deleting arrays.
-//   See gc_cpp.h for details.  No effect on the C part of the collector.
-//   This is defined implicitly in a few environments.
-// -DREDIRECT_MALLOC=X causes malloc, realloc, and free to be defined
-//   as aliases for X, GC_realloc, and GC_free, respectively.
-//   Calloc is redefined in terms of the new malloc.  X should
-//   be either GC_malloc or GC_malloc_uncollectable.
-//   The former is occasionally useful for working around leaks in code
-//   you don't want to (or can't) look at.  It may not work for
-//   existing code, but it often does.  Neither works on all platforms,
-//   since some ports use malloc or calloc to obtain system memory.
-//   (Probably works for UNIX, and win32.)
-// -DNO_DEBUG removes GC_dump and the debugging routines it calls.
-//   Reduces code size slightly at the expense of debuggability.
diff --git a/boehm-gc/Mac_files/MacOS_config.h b/boehm-gc/Mac_files/MacOS_config.h
deleted file mode 100644
index 407bdf154a2..00000000000
--- a/boehm-gc/Mac_files/MacOS_config.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-	MacOS_config.h
-	
-	Configuration flags for Macintosh development systems.
-	
- 	<Revision History>
- 	
- 	11/16/95  pcb  Updated compilation flags to reflect latest 4.6 Makefile.
-	
-	by Patrick C. Beard.
- */
-/* Boehm, November 17, 1995 12:10 pm PST */
-
-#ifdef __MWERKS__
-
-// for CodeWarrior Pro with Metrowerks Standard Library (MSL).
-// #define MSL_USE_PRECOMPILED_HEADERS 0
-#include <ansi_prefix.mac.h>
-#ifndef __STDC__
-#define __STDC__ 0
-#endif
-
-#endif /* __MWERKS__ */
-
-// these are defined again in gc_priv.h.
-#undef TRUE
-#undef FALSE
-
-#define ALL_INTERIOR_POINTERS	// follows interior pointers.
-#define SILENT			// no collection messages.
-//#define DONT_ADD_BYTE_AT_END	// no padding.
-//#define SMALL_CONFIG		// whether to use a smaller heap.
-#define NO_SIGNALS		// signals aren't real on the Macintosh.
-#define USE_TEMPORARY_MEMORY	// use Macintosh temporary memory.
-
-// CFLAGS= -O -DNO_SIGNALS -DSILENT -DALL_INTERIOR_POINTERS
-//
-//LIBGC_CFLAGS= -O -DNO_SIGNALS -DSILENT \
-//    -DREDIRECT_MALLOC=GC_malloc_uncollectable \
-//    -DDONT_ADD_BYTE_AT_END -DALL_INTERIOR_POINTERS
-//   Flags for building libgc.a -- the last two are required.
-//
-// Setjmp_test may yield overly optimistic results when compiled
-// without optimization.
-// -DSILENT disables statistics printing, and improves performance.
-// -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-//   altered stubborn objects, at substantial performance cost.
-//   Use only for incremental collector debugging.
-// -DFIND_LEAK causes the collector to assume that all inaccessible
-//   objects should have been explicitly deallocated, and reports exceptions.
-//   Finalization and the test program are not usable in this mode.
-// -DSOLARIS_THREADS enables support for Solaris (thr_) threads.
-//   (Clients should also define SOLARIS_THREADS and then include
-//   gc.h before performing thr_ or GC_ operations.)
-//   This is broken on nonSPARC machines.
-// -DALL_INTERIOR_POINTERS allows all pointers to the interior
-//   of objects to be recognized.  (See gc_priv.h for consequences.)
-// -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-//   usually causing it to use less space in such situations.
-//   Incremental collection no longer works in this case.
-// -DLARGE_CONFIG tunes the collector for unusually large heaps.
-//   Necessary for heaps larger than about 500 MB on most machines.
-//   Recommended for heaps larger than about 64 MB.
-// -DDONT_ADD_BYTE_AT_END is meaningful only with
-//   -DALL_INTERIOR_POINTERS.  Normally -DALL_INTERIOR_POINTERS
-//   causes all objects to be padded so that pointers just past the end of
-//   an object can be recognized.  This can be expensive.  (The padding
-//   is normally more than one byte due to alignment constraints.)
-//   -DDONT_ADD_BYTE_AT_END disables the padding.
-// -DNO_SIGNALS does not disable signals during critical parts of
-//   the GC process.  This is no less correct than many malloc 
-//   implementations, and it sometimes has a significant performance
-//   impact.  However, it is dangerous for many not-quite-ANSI C
-//   programs that call things like printf in asynchronous signal handlers.
-// -DGC_OPERATOR_NEW_ARRAY declares that the C++ compiler supports the
-//   new syntax "operator new[]" for allocating and deleting arrays.
-//   See gc_cpp.h for details.  No effect on the C part of the collector.
-//   This is defined implicitly in a few environments.
-// -DREDIRECT_MALLOC=X causes malloc, realloc, and free to be defined
-//   as aliases for X, GC_realloc, and GC_free, respectively.
-//   Calloc is redefined in terms of the new malloc.  X should
-//   be either GC_malloc or GC_malloc_uncollectable.
-//   The former is occasionally useful for working around leaks in code
-//   you don't want to (or can't) look at.  It may not work for
-//   existing code, but it often does.  Neither works on all platforms,
-//   since some ports use malloc or calloc to obtain system memory.
-//   (Probably works for UNIX, and win32.)
-// -DNO_DEBUG removes GC_dump and the debugging routines it calls.
-//   Reduces code size slightly at the expense of debuggability.
diff --git a/boehm-gc/Mac_files/dataend.c b/boehm-gc/Mac_files/dataend.c
deleted file mode 100644
index a3e3fe8446f..00000000000
--- a/boehm-gc/Mac_files/dataend.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-	dataend.c
-	
-	A hack to get the extent of global data for the Macintosh.
-	
-	by Patrick C. Beard.
- */
-
-long __dataend;
diff --git a/boehm-gc/Mac_files/datastart.c b/boehm-gc/Mac_files/datastart.c
deleted file mode 100644
index a9e0dd59410..00000000000
--- a/boehm-gc/Mac_files/datastart.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-	datastart.c
-	
-	A hack to get the extent of global data for the Macintosh.
-	
-	by Patrick C. Beard.
- */
-
-long __datastart;
diff --git a/boehm-gc/Makefile.DLLs b/boehm-gc/Makefile.DLLs
deleted file mode 100644
index 011f49d3bcf..00000000000
--- a/boehm-gc/Makefile.DLLs
+++ /dev/null
@@ -1,107 +0,0 @@
-#-----------------------------------------------------------------------------#
-
-# Makefile.DLLs, version 0.4.
-
-# Contributed by Fergus Henderson.
-
-# This Makefile contains rules for creating DLLs on Windows using gnu-win32.
-
-#-----------------------------------------------------------------------------#
-
-# This rule creates a `.def' file, which lists the symbols that are exported
-# from the DLL.  We use `nm' to get a list of all the exported text (`T')
-# symbols and data symbols -- including uninitialized data (`B'),
-# initialized data (`D'), read-only data (`R'), and common blocks (`C').
-%.def: %.a
-	echo EXPORTS > $@
-	nm $< | grep '^........ [BCDRT] _' | sed 's/[^_]*_//' >> $@
-
-# We need to use macros to access global data:
-# the user of the DLL must refer to `foo' as `(*__imp_foo)'.
-# This rule creates a `_globals.h' file, which contains macros
-# for doing this.
-
-SYM_PREFIX = $(firstword $(SYM_PREFIX-$*) $*)
-DLL_MACRO = $(SYM_PREFIX)_USE_DLL
-IMP_MACRO = $(SYM_PREFIX)_IMP
-GLOBAL_MACRO = $(SYM_PREFIX)_GLOBAL
-
-%_globals.h: %.a
-	echo "/* automatically generated by Makefile.DLLs */"	> $@
-	echo "#if defined(__GNUC__) && defined(_WIN32) \\"	>> $@
-	echo "	&& defined($(DLL_MACRO))"			>> $@
-	echo "#  define $(IMP_MACRO)(name)	__imp_##name" 	>> $@
-	echo "#  define $(GLOBAL_MACRO)(name)	(*$(IMP_MACRO)(name))" >> $@
-	echo "#else"						>> $@
-	echo "#  define $(GLOBAL_MACRO)(name)	name"		>> $@
-	echo "#endif"						>> $@
-	echo ""							>> $@
-	for sym in `nm $< | grep '^........ [BCDR] _' | sed 's/[^_]*_//'`; do \
-		echo "#define $$sym	$(GLOBAL_MACRO)($$sym)"	>> $@; \
-	done
-
-# This rule creates the export object file (`foo.exp') which contains the
-# jump table array; this export object file becomes part of the DLL. 
-# This rule also creates the import library (`foo_dll.a') which contains small
-# stubs for all the functions exported by the DLL which jump to them via the
-# jump table.  Executables that will use the DLL must be linked against this
-# stub library.
-%.exp %_dll.a : %.def
-	dlltool $(DLLTOOLFLAGS) $(DLLTOOLFLAGS-$*)		\
-		--def $<					\
-		--dllname $*.dll				\
-		--output-exp $*.exp				\
-		--output-lib $*_dll.a
-
-# The `sed' commands below are to convert DOS-style `C:\foo\bar'
-# pathnames into Unix-style `//c/foo/bar' pathnames.
-CYGWIN32_LIBS = $(shell echo					\
-	-L`dirname \`gcc -print-file-name=libgcc.a |		\
-	sed -e 's@^\\\\([A-Za-z]\\\\):@//\\\\1@g' -e 's@\\\\\\\\@/@g' \` ` \
-	-L`dirname \`gcc -print-file-name=libcygwin.a |	\
-	sed -e 's@^\\\\([A-Za-z]\\\\):@//\\\\1@g' -e 's@\\\\\\\\@/@g' \` ` \
-	-L`dirname \`gcc -print-file-name=libkernel32.a | \
-	sed -e 's@^\\\\([A-Za-z]\\\\):@//\\\\1@g' -e 's@\\\\\\\\@/@g' \` ` \
-	-lgcc -lcygwin -lkernel32 -lgcc)
-
-RELOCATABLE=yes
-
-ifeq "$(strip $(RELOCATABLE))" "yes"
-
-# to create relocatable DLLs, we need to do two passes
-%.dll: %.exp %.a dll_fixup.o dll_init.o
-	$(LD) $(LDFLAGS) $(LDFLAGS-$*) --dll -o $*.base			\
-		-e _dll_entry@12 dll_init.o				\
-		dll_fixup.o $*.exp $*.a					\
-		$(LDLIBS) $(LDLIBS-$*)					\
-		$(CYGWIN32_LIBS)
-	$(LD) $(LDFLAGS) $(LDFLAGS-$*) --dll --base-file $*.base -o $@	\
-		-e _dll_entry@12 dll_init.o				\
-		dll_fixup.o $*.exp $*.a					\
-		$(LDLIBS) $(LDLIBS-$*)					\
-		$(CYGWIN32_LIBS)
-	rm -f $*.base
-else
-
-%.dll: %.exp %.a dll_fixup.o dll_init.o
-	$(LD) $(LDFLAGS) $(LDFLAGS-$*) --dll -o $@			\
-		-e _dll_entry@12 dll_init.o				\
-		dll_fixup.o $*.exp $*.a					\
-		$(LDLIBS) $(LDLIBS-$*)					\
-		$(CYGWIN32_LIBS)
-
-endif
-
-# This black magic piece of assembler needs to be linked in in order to
-# properly terminate the list of imported DLLs.
-dll_fixup.s:
-	echo '.section .idata$$3' 	> dll_fixup.s
-	echo '.long 0,0,0,0, 0,0,0,0'	>> dll_fixup.s
-
-# This bit is necessary to provide an initialization function for the DLL.
-dll_init.c:
-	echo '__attribute__((stdcall))' > dll_init.c
-	echo 'int dll_entry(int handle, int reason, void *ptr)' >> dll_init.c
-	echo '{return 1; }' >> dll_init.c
-
-dont_throw_away: dll_fixup.o dll_init.o
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
deleted file mode 100644
index fa187ef31ee..00000000000
--- a/boehm-gc/Makefile.am
+++ /dev/null
@@ -1,102 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-
-## FIXME: `make dist' in this directory will not currently work.  Many
-## files that should be in the distribution are not mentioned in this
-## Makefile.am.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects no-dist
-ACLOCAL_AMFLAGS = -I .. -I ../config
-
-SUBDIRS = include testsuite
-
-noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
-
-if POWERPC_DARWIN
-asm_libgcjgc_sources = powerpc_darwin_mach_dep.s
-else
-asm_libgcjgc_sources = 
-endif
-
-libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
-dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
-malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
-obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
-specific.c stubborn.c typd_mlc.c \
-backgraph.c win32_threads.c \
-pthread_support.c pthread_stop_world.c darwin_stop_world.c \
-$(asm_libgcjgc_sources)
-
-libgcjgc_convenience_la_SOURCES = $(libgcjgc_la_SOURCES)
-
-EXTRA_DIST = alpha_mach_dep.S \
-mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
-rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
-sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
-
-# Include THREADLIBS here to ensure that the correct versions of
-# linuxthread semaphore functions get linked:
-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
-libgcjgc_la_DEPENDENCIES = $(addobjs)
-libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
-libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)
-
-libgcjgc_convenience_la_LIBADD = $(addobjs)
-libgcjgc_convenience_la_DEPENDENCIES = $(addobjs)
-
-AM_CXXFLAGS = $(GC_CFLAGS) $(THREADCFLAGS)
-AM_CFLAGS = $(GC_CFLAGS) $(THREADCFLAGS)
-AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS)
-
-## FIXME: we shouldn't have to do this, but automake forces us to.
-.s.lo:
-## We use -Wp,-P to strip #line directives.  Irix `as' chokes on
-## these.
-	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
-.S.lo:
-	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
-
-# Work around what appears to be a GNU make bug handling MAKEFLAGS
-# values defined in terms of make variables, as is the case for CC and
-# friends when we are called from the top level Makefile.
-AM_MAKEFLAGS = \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-	"CFLAGS=$(CFLAGS)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"LDFLAGS=$(LDFLAGS)" \
-	"LIBCFLAGS=$(LIBCFLAGS)" \
-	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-	"MAKE=$(MAKE)" \
-	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-	"PICFLAG=$(PICFLAG)" \
-	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-	"SHELL=$(SHELL)" \
-	"EXPECT=$(EXPECT)" \
-	"RUNTEST=$(RUNTEST)" \
-	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-	"exec_prefix=$(exec_prefix)" \
-	"infodir=$(infodir)" \
-	"libdir=$(libdir)" \
-	"prefix=$(prefix)" \
-	"tooldir=$(tooldir)" \
-	"AR=$(AR)" \
-	"AS=$(AS)" \
-	"CC=$(CC)" \
-	"CXX=$(CXX)" \
-	"LD=$(LD)" \
-	"LIBCFLAGS=$(LIBCFLAGS)" \
-	"NM=$(NM)" \
-	"PICFLAG=$(PICFLAG)" \
-	"RANLIB=$(RANLIB)" \
-	"DESTDIR=$(DESTDIR)"
-
-CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
-
-MAKEOVERRIDES=
diff --git a/boehm-gc/Makefile.direct b/boehm-gc/Makefile.direct
deleted file mode 100644
index 8b4dff1fb73..00000000000
--- a/boehm-gc/Makefile.direct
+++ /dev/null
@@ -1,685 +0,0 @@
-# This is the original manually generated Makefile.  It may still be used
-# to build the collector.
-#
-# Primary targets:
-# gc.a - builds basic library
-# c++ - adds C++ interface to library
-# cords - adds cords (heavyweight strings) to library
-# test - prints porting information, then builds basic version of gc.a,
-#      	 and runs some tests of collector and cords.  Does not add cords or
-#	 c++ interface to gc.a
-# cord/de - builds dumb editor based on cords.
-ABI_FLAG= 
-# ABI_FLAG should be the cc flag that specifies the ABI.  On most
-# platforms this will be the empty string.  Possible values:
-# +DD64 for 64-bit executable on HP/UX.
-# -n32, -n64, -o32 for SGI/MIPS ABIs.
-
-AS_ABI_FLAG=$(ABI_FLAG)
-# ABI flag for assembler.  On HP/UX this is +A64 for 64 bit
-# executables.
-
-CC=cc $(ABI_FLAG)
-CXX=g++ $(ABI_FLAG)
-AS=as $(AS_ABI_FLAG)
-#  The above doesn't work with gas, which doesn't run cpp.
-#  Define AS as `gcc -c -x assembler-with-cpp' instead.
-
-# Redefining srcdir allows object code for the nonPCR version of the collector
-# to be generated in different directories.
-srcdir= .
-VPATH= $(srcdir)
-
-CFLAGS= -O -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
-
-# To build the parallel collector on Linux, add to the above:
-# -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
-# To build the parallel collector in a static library on HP/UX,
-# add to the above:
-# -DGC_HPUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC -D_POSIX_C_SOURCE=199506L -mt
-# To build the thread-safe collector on Tru64, add to the above:
-# -pthread -DGC_OSF1_THREADS
-
-# HOSTCC and HOSTCFLAGS are used to build executables that will be run as
-# part of the build process, i.e. on the build machine.  These will usually
-# be the same as CC and CFLAGS, except in a cross-compilation environment.
-# Note that HOSTCFLAGS should include any -D flags that affect thread support.
-HOSTCC=$(CC)
-HOSTCFLAGS=$(CFLAGS)
-
-# For dynamic library builds, it may be necessary to add flags to generate
-# PIC code, e.g. -fPIC on Linux.
-
-# Setjmp_test may yield overly optimistic results when compiled
-# without optimization.
-
-# These define arguments influence the collector configuration:
-# -DSILENT disables statistics printing, and improves performance.
-# -DFIND_LEAK causes GC_find_leak to be initially set.
-#   This causes the collector to assume that all inaccessible
-#   objects should have been explicitly deallocated, and reports exceptions.
-#   Finalization and the test program are not usable in this mode.
-# -DGC_SOLARIS_THREADS enables support for Solaris (thr_) threads.
-#   (Clients should also define GC_SOLARIS_THREADS and then include
-#   gc.h before performing thr_ or dl* or GC_ operations.)
-#   Must also define -D_REENTRANT.
-# -DGC_SOLARIS_PTHREADS enables support for Solaris pthreads.
-#   (Internally this define GC_SOLARIS_THREADS as well.)
-# -DGC_IRIX_THREADS enables support for Irix pthreads.  See README.irix.
-# -DGC_HPUX_THREADS enables support for HP/UX 11 pthreads.
-#   Also requires -D_REENTRANT or -D_POSIX_C_SOURCE=199506L. See README.hp.
-# -DGC_LINUX_THREADS enables support for Xavier Leroy's Linux threads.
-#   see README.linux.  -D_REENTRANT may also be required.
-# -DGC_OSF1_THREADS enables support for Tru64 pthreads.
-# -DGC_FREEBSD_THREADS enables support for FreeBSD pthreads.
-#   Appeared to run into some underlying thread problems.
-# -DGC_DARWIN_THREADS enables support for Mac OS X pthreads.
-# -DGC_AIX_THREADS enables support for IBM AIX threads.
-# -DGC_DGUX386_THREADS enables support for DB/UX on I386 threads.
-#   See README.DGUX386.
-# -DGC_WIN32_THREADS enables support for win32 threads.  That makes sense
-#   for this Makefile only under Cygwin.
-# -DGC_THREADS should set the appropriate one of the above macros.
-#   It assumes pthreads for Solaris.
-# -DALL_INTERIOR_POINTERS allows all pointers to the interior
-#   of objects to be recognized.  (See gc_priv.h for consequences.)
-#   Alternatively, GC_all_interior_pointers can be set at process
-#   initialization time.
-# -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-#   usually causing it to use less space in such situations.
-#   Incremental collection no longer works in this case.
-# -DLARGE_CONFIG tunes the collector for unusually large heaps.
-#   Necessary for heaps larger than about 500 MB on most machines.
-#   Recommended for heaps larger than about 64 MB.
-# -DDONT_ADD_BYTE_AT_END is meaningful only with -DALL_INTERIOR_POINTERS or
-#   GC_all_interior_pointers = 1.  Normally -DALL_INTERIOR_POINTERS
-#   causes all objects to be padded so that pointers just past the end of
-#   an object can be recognized.  This can be expensive.  (The padding
-#   is normally more than one byte due to alignment constraints.)
-#   -DDONT_ADD_BYTE_AT_END disables the padding.
-# -DNO_SIGNALS does not disable signals during critical parts of
-#   the GC process.  This is no less correct than many malloc 
-#   implementations, and it sometimes has a significant performance
-#   impact.  However, it is dangerous for many not-quite-ANSI C
-#   programs that call things like printf in asynchronous signal handlers.
-#   This is on by default.  Turning it off has not been extensively tested with
-#   compilers that reorder stores.  It should have been.
-# -DNO_EXECUTE_PERMISSION may cause some or all of the heap to not
-#   have execute permission, i.e. it may be impossible to execute
-#   code from the heap.  Currently this only affects the incremental
-#   collector on UNIX machines.  It may greatly improve its performance,
-#   since this may avoid some expensive cache synchronization.
-# -DGC_NO_OPERATOR_NEW_ARRAY declares that the C++ compiler does not support
-#   the  new syntax "operator new[]" for allocating and deleting arrays.
-#   See gc_cpp.h for details.  No effect on the C part of the collector.
-#   This is defined implicitly in a few environments.  Must also be defined
-#   by clients that use gc_cpp.h.
-# -DREDIRECT_MALLOC=X causes malloc to be defined as alias for X.
-#   Unless the following macros are defined, realloc is also redirected
-#   to GC_realloc, and free is redirected to GC_free.
-#   Calloc and strdup are redefined in terms of the new malloc.  X should
-#   be either GC_malloc or GC_malloc_uncollectable, or
-#   GC_debug_malloc_replacement.  (The latter invokes GC_debug_malloc
-#   with dummy source location information, but still results in
-#   properly remembered call stacks on Linux/X86 and Solaris/SPARC.
-#   It requires that the following two macros also be used.)
-#   The former is occasionally useful for working around leaks in code
-#   you don't want to (or can't) look at.  It may not work for
-#   existing code, but it often does.  Neither works on all platforms,
-#   since some ports use malloc or calloc to obtain system memory.
-#   (Probably works for UNIX, and win32.)  If you build with DBG_HDRS_ALL,
-#   you should only use GC_debug_malloc_replacement as a malloc
-#   replacement.
-# -DREDIRECT_REALLOC=X causes GC_realloc to be redirected to X.
-#   The canonical use is -DREDIRECT_REALLOC=GC_debug_realloc_replacement,
-#   together with -DREDIRECT_MALLOC=GC_debug_malloc_replacement to
-#   generate leak reports with call stacks for both malloc and realloc.
-#   This also requires the following:
-# -DREDIRECT_FREE=X causes free to be redirected to X.  The
-#   canonical use is -DREDIRECT_FREE=GC_debug_free.
-# -DIGNORE_FREE turns calls to free into a noop.  Only useful with
-#   -DREDIRECT_MALLOC.
-# -DNO_DEBUGGING removes GC_dump and the debugging routines it calls.
-#   Reduces code size slightly at the expense of debuggability.
-# -DJAVA_FINALIZATION makes it somewhat safer to finalize objects out of
-#   order by specifying a nonstandard finalization mark procedure  (see
-#   finalize.c).  Objects reachable from finalizable objects will be marked
-#   in a sepearte postpass, and hence their memory won't be reclaimed.
-#   Not recommended unless you are implementing a language that specifies
-#   these semantics.  Since 5.0, determines only only the initial value
-#   of GC_java_finalization variable.
-# -DFINALIZE_ON_DEMAND causes finalizers to be run only in response
-#   to explicit GC_invoke_finalizers() calls.
-#   In 5.0 this became runtime adjustable, and this only determines the
-#   initial value of GC_finalize_on_demand.
-# -DATOMIC_UNCOLLECTABLE includes code for GC_malloc_atomic_uncollectable.
-#   This is useful if either the vendor malloc implementation is poor,
-#   or if REDIRECT_MALLOC is used.
-# -DHBLKSIZE=ddd, where ddd is a power of 2 between 512 and 16384, explicitly
-#   sets the heap block size.  Each heap block is devoted to a single size and
-#   kind of object.  For the incremental collector it makes sense to match
-#   the most likely page size.  Otherwise large values result in more
-#   fragmentation, but generally better performance for large heaps.
-# -DUSE_MMAP use MMAP instead of sbrk to get new memory.
-#   Works for Solaris and Irix.
-# -DUSE_MUNMAP causes memory to be returned to the OS under the right
-#   circumstances.  This currently disables VM-based incremental collection.
-#   This is currently experimental, and works only under some Unix,
-#   Linux and Windows versions.
-# -DMMAP_STACKS (for Solaris threads) Use mmap from /dev/zero rather than
-#   GC_scratch_alloc() to get stack memory.
-# -DPRINT_BLACK_LIST Whenever a black list entry is added, i.e. whenever
-#   the garbage collector detects a value that looks almost, but not quite,
-#   like a pointer, print both the address containing the value, and the
-#   value of the near-bogus-pointer.  Can be used to identifiy regions of
-#   memory that are likely to contribute misidentified pointers.
-# -DKEEP_BACK_PTRS Add code to save back pointers in debugging headers
-#   for objects allocated with the debugging allocator.  If all objects
-#   through GC_MALLOC with GC_DEBUG defined, this allows the client
-#   to determine how particular or randomly chosen objects are reachable
-#   for debugging/profiling purposes.  The gc_backptr.h interface is
-#   implemented only if this is defined.
-# -DGC_ASSERTIONS Enable some internal GC assertion checking.  Currently
-#   this facility is only used in a few places.  It is intended primarily
-#   for debugging of the garbage collector itself, but could also
-# -DDBG_HDRS_ALL Make sure that all objects have debug headers.  Increases
-#   the reliability (from 99.9999% to 100% mod. bugs) of some of the debugging
-#   code (especially KEEP_BACK_PTRS).  Makes -DSHORT_DBG_HDRS possible.
-#   Assumes that all client allocation is done through debugging
-#   allocators.
-# -DSHORT_DBG_HDRS Assume that all objects have debug headers.  Shorten
-#   the headers to minimize object size, at the expense of checking for
-#   writes past the end of an object.  This is intended for environments
-#   in which most client code is written in a "safe" language, such as
-#   Scheme or Java.  Assumes that all client allocation is done using
-#   the GC_debug_ functions, or through the macros that expand to these,
-#   or by redirecting malloc to GC_debug_malloc_replacement.
-#   (Also eliminates the field for the requested object size.)
-#   occasionally be useful for debugging of client code.  Slows down the
-#   collector somewhat, but not drastically.
-# -DSAVE_CALL_COUNT=<n> Set the number of call frames saved with objects
-#   allocated through the debugging interface.  Affects the amount of
-#   information generated in leak reports.  Only matters on platforms
-#   on which we can quickly generate call stacks, currently Linux/(X86 & SPARC)
-#   and Solaris/SPARC and platforms that provide execinfo.h.
-#   Default is zero.  On X86, client
-#   code should NOT be compiled with -fomit-frame-pointer.
-# -DSAVE_CALL_NARGS=<n> Set the number of functions arguments to be
-#   saved with each call frame.  Default is zero.  Ignored if we
-#   don't know how to retrieve arguments on the platform.
-# -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-#   altered stubborn objects, at substantial performance cost.
-#   Use only for debugging of the incremental collector.
-# -DGC_GCJ_SUPPORT includes support for gcj (and possibly other systems
-#   that include a pointer to a type descriptor in each allocated object).
-#   Building this way requires an ANSI C compiler.
-# -DUSE_I686_PREFETCH causes the collector to issue Pentium III style
-#   prefetch instructions.  No effect except on X86 Linux platforms.
-#   Assumes a very recent gcc-compatible compiler and assembler.
-#   (Gas prefetcht0 support was added around May 1999.)
-#   Empirically the code appears to still run correctly on Pentium II
-#   processors, though with no performance benefit.  May not run on other
-#   X86 processors?  In some cases this improves performance by
-#   15% or so.
-# -DUSE_3DNOW_PREFETCH causes the collector to issue AMD 3DNow style
-#   prefetch instructions.  Same restrictions as USE_I686_PREFETCH.
-#   Minimally tested.  Didn't appear to be an obvious win on a K6-2/500.
-# -DUSE_PPC_PREFETCH causes the collector to issue PowerPC style
-#   prefetch instructions.  No effect except on PowerPC OS X platforms.
-#   Performance impact untested.
-# -DGC_USE_LD_WRAP in combination with the old flags listed in README.linux
-#   causes the collector some system and pthread calls in a more transparent
-#   fashion than the usual macro-based approach.  Requires GNU ld, and
-#   currently probably works only with Linux.
-# -DTHREAD_LOCAL_ALLOC defines GC_local_malloc(), GC_local_malloc_atomic()
-#   and GC_local_gcj_malloc().  Needed for gc_gcj.h interface.  These allocate
-#   in a way that usually does not involve acquisition of a global lock.
-#   Currently works only on platforms such as Linux which use pthread_support.c.
-#   Recommended for multiprocessors.
-# -DUSE_COMPILER_TLS causes thread local allocation to use compiler-supported
-#   "__thread" thread-local variables.  This is the default in HP/UX.  It
-#   may help performance on recent Linux installations.  (It failed for
-#   me on RedHat 8, but appears to work on RedHat 9.)
-# -DPARALLEL_MARK allows the marker to run in multiple threads.  Recommended
-#   for multiprocessors.  Currently requires Linux on X86 or IA64, though
-#   support for other Posix platforms should be fairly easy to add,
-#   if the thread implementation is otherwise supported.
-# -DNO_GETENV prevents the collector from looking at environment variables.
-#   These may otherwise alter its configuration, or turn off GC altogether.
-#   I don't know of a reason to disable this, except possibly if the
-#   resulting process runs as a privileged user?
-# -DUSE_GLOBAL_ALLOC.  Win32 only.  Use GlobalAlloc instead of
-#   VirtualAlloc to allocate the heap.  May be needed to work around
-#   a Windows NT/2000 issue.  Incompatible with USE_MUNMAP.
-#   See README.win32 for details.
-# -DMAKE_BACK_GRAPH. Enable GC_PRINT_BACK_HEIGHT environment variable.
-#   See README.environment for details.  Experimental. Limited platform
-#   support.  Implies DBG_HDRS_ALL.  All allocation should be done using
-#   the debug interface.
-# -DSTUBBORN_ALLOC allows allocation of "hard to change" objects, and thus
-#   makes incremental collection easier.  Was enabled by default until 6.0.
-#   Rarely used, to my knowledge.
-# -DHANDLE_FORK attempts to make GC_malloc() work in a child process fork()ed
-#   from a multithreaded parent.  Currently only supported by pthread_support.c.
-#   (Similar code should work on Solaris or Irix, but it hasn't been tried.)
-# -DTEST_WITH_SYSTEM_MALLOC causes gctest to allocate (and leak) large chunks
-#   of memory with the standard system malloc.  This will cause the root
-#   set and collected heap to grow significantly if malloced memory is
-#   somehow getting traced by the collector.  This has no impact on the
-#   generated library; it only affects the test.
-# -DPOINTER_MASK=0x... causes candidate pointers to be ANDed with the
-#   given mask before being considered.  If either this or the following
-#   macro is defined, it will be assumed that all pointers stored in
-#   the heap need to be processed this way.  Stack and register pointers
-#   will be considered both with and without processing.
-#   These macros are normally needed only to support systems that use
-#   high-order pointer tags. EXPERIMENTAL.
-# -DPOINTER_SHIFT=n causes the collector to left shift candidate pointers
-#   by the indicated amount before trying to interpret them.  Applied
-#   after POINTER_MASK. EXPERIMENTAL.  See also the preceding macro.
-# -DDARWIN_DONT_PARSE_STACK Causes the Darwin port to discover thread
-#   stack bounds in the same way as other pthread ports, without trying to
-#   walk the frames onthe stack.  This is recommended only as a fallback
-#   for applications that don't support proper stack unwinding.
-#
-
-CXXFLAGS= $(CFLAGS) 
-AR= ar
-RANLIB= ranlib
-
-
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o pthread_support.o pthread_stop_world.o darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o gc_dlopen.o backgraph.o win32_threads.o
-
-CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c pthread_support.c pthread_stop_world.c darwin_stop_world.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c gc_dlopen.c backgraph.c win32_threads.c
-
-CORD_SRCS=  cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC
-
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
-
-SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
-    sparc_mach_dep.S include/gc.h include/gc_typed.h \
-    include/private/gc_hdrs.h include/private/gc_priv.h \
-    include/private/gcconfig.h include/private/gc_pmark.h \
-    include/gc_inl.h include/gc_inline.h include/gc_mark.h \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
-    gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
-    include/new_gc_alloc.h include/gc_allocator.h \
-    include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
-    include/private/solaris_threads.h include/gc_backptr.h \
-    hpux_test_and_clear.s include/gc_gcj.h \
-    include/gc_local_alloc.h include/private/dbg_mlc.h \
-    include/private/specific.h powerpc_darwin_mach_dep.s \
-    include/leak_detector.h include/gc_amiga_redirects.h \
-    include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
-    include/gc_config_macros.h include/private/pthread_support.h \
-    include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
-    include/private/darwin_stop_world.h $(CORD_SRCS)
-
-DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
-	doc/README.amiga doc/README.cords doc/debugging.html \
-	doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
-	doc/README.sgi doc/README.solaris2 doc/README.uts \
-	doc/README.win32 doc/barrett_diagram doc/README \
-        doc/README.contributors doc/README.changes doc/gc.man \
-	doc/README.environment doc/tree.html doc/gcdescr.html \
-	doc/README.autoconf doc/README.macros doc/README.ews4800 \
-	doc/README.DGUX386 doc/README.arm.cross doc/leak.html \
-	doc/scale.html doc/gcinterface.html doc/README.darwin \
-	doc/simple_example.html
-
-TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
-	tests/leak_test.c tests/thread_leak_test.c tests/middle.c
-
-GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
-		 libtool.m4 install-sh configure.host Makefile.in \
-		 aclocal.m4 config.sub config.guess \
-		 include/Makefile.am include/Makefile.in \
-		 doc/Makefile.am doc/Makefile.in \
-		 ltmain.sh mkinstalldirs depcomp missing
-
-OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \
-		 BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \
-		 PCR-Makefile SMakefile.amiga Makefile.DLLs \
-		 digimars.mak Makefile.direct NT_STATIC_THREADS_MAKEFILE
-#	Makefile and Makefile.direct are copies of each other.
-
-OTHER_FILES= Makefile setjmp_t.c callprocs pc_excludes \
-           MacProjects.sit.hqx MacOS.c \
-           Mac_files/datastart.c Mac_files/dataend.c \
-           Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-	   version.h AmigaOS.c \
-	   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
-
-CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
-
-UTILS= if_mach if_not_there threadlibs
-
-# Libraries needed for curses applications.  Only needed for de.
-CURSES= -lcurses -ltermlib
-
-# The following is irrelevant on most systems.  But a few
-# versions of make otherwise fork the shell specified in
-# the SHELL environment variable.
-SHELL= /bin/sh
-
-SPECIALCFLAGS = -I$(srcdir)/include
-# Alternative flags to the C compiler for mach_dep.c.
-# Mach_dep.c often doesn't like optimization, and it's
-# not time-critical anyway.
-# Set SPECIALCFLAGS to -q nodirect_code on Encore.
-
-all: gc.a gctest
-
-LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
-
-BSD-pkg-all: bsd-libgc.a bsd-libleak.a
-
-bsd-libgc.a:
-	$(MAKE) CFLAGS="$(CFLAGS)" clean c++-t
-	mv gc.a bsd-libgc.a
-
-bsd-libleak.a:
-	$(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt
-	mv gc.a bsd-libleak.a
-
-BSD-pkg-install: BSD-pkg-all
-	${CP} bsd-libgc.a libgc.a
-	${INSTALL_DATA} libgc.a ${PREFIX}/lib
-	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
-	${INSTALL_MAN} doc/gc.man ${PREFIX}/man/man3/gc.3
-
-pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \
-include/private/gc_locks.h include/gc.h include/private/gcconfig.h \
-mach_dep.o $(SRCS)
-	$(MAKE) -f PCR-Makefile depend
-	$(MAKE) -f PCR-Makefile
-
-$(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \
-    $(srcdir)/include/private/gc_priv.h \
-    $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \
-    $(srcdir)/include/gc.h $(srcdir)/include/gc_pthread_redirects.h \
-    $(srcdir)/include/private/gcconfig.h $(srcdir)/include/gc_typed.h \
-    $(srcdir)/include/gc_config_macros.h Makefile
-# The dependency on Makefile is needed.  Changing
-# options such as -DSILENT affects the size of GC_arrays,
-# invalidating all .o files that rely on gc_priv.h
-
-mark.o typd_mlc.o finalize.o ptr_chck.o: $(srcdir)/include/gc_mark.h $(srcdir)/include/private/gc_pmark.h
-
-specific.o pthread_support.o: $(srcdir)/include/private/specific.h
-
-solaris_threads.o solaris_pthreads.o: $(srcdir)/include/private/solaris_threads.h
-
-dbg_mlc.o gcj_mlc.o: $(srcdir)/include/private/dbg_mlc.h
-
-tests/test.o: tests $(srcdir)/tests/test.c
-	$(CC) $(CFLAGS) -c $(srcdir)/tests/test.c
-	mv test.o tests/test.o
-
-tests:
-	mkdir tests
-
-base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
-	echo > base_lib
-	rm -f dont_ar_1
-	./if_mach SPARC SUNOS5 touch dont_ar_1
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o
-	./if_mach M68K AMIGA touch dont_ar_1
-	./if_mach M68K AMIGA $(AR) -vrus gc.a $(OBJS) dyn_load.o
-	./if_not_there dont_ar_1 $(AR) ru gc.a $(OBJS) dyn_load.o
-	./if_not_there dont_ar_1 $(RANLIB) gc.a || cat /dev/null
-#	ignore ranlib failure; that usually means it doesn't exist, and isn't needed
-
-cords: $(CORD_OBJS) cord/cordtest $(UTILS)
-	rm -f dont_ar_3
-	./if_mach SPARC SUNOS5 touch dont_ar_3
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS)
-	./if_mach M68K AMIGA touch dont_ar_3
-	./if_mach M68K AMIGA $(AR) -vrus gc.a $(CORD_OBJS)
-	./if_not_there dont_ar_3 $(AR) ru gc.a $(CORD_OBJS)
-	./if_not_there dont_ar_3 $(RANLIB) gc.a || cat /dev/null
-
-gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h Makefile
-	$(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc
-
-test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \
-base_lib $(UTILS)
-	rm -f test_cpp
-	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs`
-	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
-
-c++-t: c++
-	./test_cpp 1
-
-c++-nt: c++
-	@echo "Use ./test_cpp 1 to test the leak library"
-
-c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp
-	rm -f dont_ar_4
-	./if_mach SPARC SUNOS5 touch dont_ar_4
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-	./if_mach M68K AMIGA touch dont_ar_4
-	./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
-	./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
-	./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null
-	./test_cpp 1
-	echo > c++
-
-dyn_load_sunos53.o: dyn_load.c
-	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
-
-# SunOS5 shared library version of the collector
-sunos5gc.so: $(OBJS) dyn_load_sunos53.o
-	$(CC) -G -o sunos5gc.so $(OBJS) dyn_load_sunos53.o -ldl
-	ln sunos5gc.so libgc.so
-
-# Alpha/OSF shared library version of the collector
-libalphagc.so: $(OBJS)
-	ld -shared -o libalphagc.so $(OBJS) dyn_load.o -lc
-	ln libalphagc.so libgc.so
-
-# IRIX shared library version of the collector
-libirixgc.so: $(OBJS) dyn_load.o
-	ld -shared $(ABI_FLAG) -o libirixgc.so $(OBJS) dyn_load.o -lc
-	ln libirixgc.so libgc.so
-
-# Linux shared library version of the collector
-liblinuxgc.so: $(OBJS) dyn_load.o
-	gcc -shared -o liblinuxgc.so $(OBJS) dyn_load.o
-	ln liblinuxgc.so libgc.so
-
-# Alternative Linux rule.  This is preferable, but is likely to break the
-# Makefile for some non-linux platforms.
-# LIBOBJS= $(patsubst %.o, %.lo, $(OBJS))
-#
-#.SUFFIXES: .lo $(SUFFIXES)
-#
-#.c.lo:
-#	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
-#
-# liblinuxgc.so: $(LIBOBJS) dyn_load.lo
-# 	gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo
-#	touch liblinuxgc.so
-
-mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.s \
-	    $(srcdir)/mips_ultrix_mach_dep.s \
-            $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s \
-	    $(srcdir)/sparc_mach_dep.S $(srcdir)/sparc_sunos4_mach_dep.s \
-	    $(srcdir)/ia64_save_regs_in_stack.s \
-	    $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS)
-	rm -f mach_dep.o
-	./if_mach MIPS IRIX5 $(CC) -c -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.s
-	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach POWERPC DARWIN $(AS) -o mach_dep.o $(srcdir)/powerpc_darwin_mach_dep.s
-	./if_mach ALPHA LINUX $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
-	./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep.o $(srcdir)/sparc_mach_dep.S
-	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-	./if_mach SPARC NETBSD $(AS) -o mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s
-	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-	./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-	./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o
-	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-
-mark_rts.o: $(srcdir)/mark_rts.c $(UTILS)
-	rm -f mark_rts.o
-	-./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
-	./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
-#	Work-around for DEC optimizer tail recursion elimination bug.
-#  The ALPHA-specific line should be removed if gcc is used.
-
-alloc.o: version.h
-
-cord:
-	mkdir cord
-
-cord/cordbscs.o: cord $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c
-	mv cordbscs.o cord/cordbscs.o
-#  not all compilers understand -o filename
-
-cord/cordxtra.o: cord $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c
-	mv cordxtra.o cord/cordxtra.o
-
-cord/cordprnt.o: cord $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c
-	mv cordprnt.o cord/cordprnt.o
-
-cord/cordtest: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS)
-	rm -f cord/cordtest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-	./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-
-cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS)
-	rm -f cord/de
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs`
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld `./threadlibs`
-	./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a
-	./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
-
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
-
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
-
-if_not_there: $(srcdir)/if_not_there.c
-	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
-
-clean: 
-	rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
-	      setjmp_test  mon.out gmon.out a.out core if_not_there if_mach \
-	      threadlibs $(CORD_OBJS) cord/cordtest cord/de 
-	-rm -f *~
-
-gctest: tests/test.o gc.a $(UTILS)
-	rm -f gctest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest  tests/test.o gc.a `./threadlibs`
-	./if_not_there gctest $(CC) $(CFLAGS) -o gctest tests/test.o gc.a `./threadlibs`
-
-# If an optimized setjmp_test generates a segmentation fault,
-# odds are your compiler is broken.  Gctest may still work.
-# Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
-
-test:  KandRtest cord/cordtest
-	cord/cordtest
-
-# Those tests that work even with a K&R C compiler:
-KandRtest: setjmp_test gctest
-	./setjmp_test
-	./gctest
-
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/version.h
-	$(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
-
-gcname: $(srcdir)/gcname.c $(srcdir)/version.h
-	$(CC) -o gcname $(srcdir)/gcname.c
-
-gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname
-	cp Makefile Makefile.old
-	cp Makefile.direct Makefile
-	rm -f `./gcname`
-	ln -s . `./gcname`
-	./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) > /tmp/gc.tar-files
-	tar cvfh gc.tar `cat /tmp/gc.tar-files`
-	cp gc.tar `./gcname`.tar
-	gzip `./gcname`.tar
-	rm `./gcname`
-
-pc_gc.tar: $(SRCS) $(OTHER_FILES)
-	tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES)
-
-floppy: pc_gc.tar
-	-mmd a:/cord
-	-mmd a:/cord/private
-	-mmd a:/include
-	-mmd a:/include/private
-	mkdir /tmp/pc_gc
-	cat pc_gc.tar | (cd /tmp/pc_gc; tar xvf -)
-	-mcopy -tmn /tmp/pc_gc/* a:
-	-mcopy -tmn /tmp/pc_gc/cord/* a:/cord
-	-mcopy -mn /tmp/pc_gc/cord/de_win.ICO a:/cord
-	-mcopy -tmn /tmp/pc_gc/cord/private/* a:/cord/private
-	-mcopy -tmn /tmp/pc_gc/include/* a:/include
-	-mcopy -tmn /tmp/pc_gc/include/private/* a:/include/private
-	rm -r /tmp/pc_gc
-
-gc.tar.Z: gc.tar
-	compress gc.tar
-
-gc.tar.gz: gc.tar
-	gzip gc.tar
-
-lint: $(CSRCS) tests/test.c
-	lint -DLINT $(CSRCS) tests/test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall|change in ANSI|improper alignment"
-
-# BTL: added to test shared library version of collector.
-# Currently works only under SunOS5.  Requires GC_INIT call from statically
-# loaded client code.
-ABSDIR = `pwd`
-gctest_dyn_link: tests/test.o libgc.so
-	$(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link tests/test.o -lgc -ldl -lthread
-
-gctest_irix_dyn_link: tests/test.o libirixgc.so
-	$(CC) -L$(ABSDIR) -o gctest_irix_dyn_link tests/test.o -lirixgc
-
-# The following appear to be dead, especially since libgc_globals.h
-# is apparently lost.
-test_dll.o: tests/test.c libgc_globals.h
-	$(CC) $(CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.o
-
-test_dll: test_dll.o libgc_dll.a libgc.dll
-	$(CC) test_dll.o -L$(ABSDIR) -lgc_dll -o test_dll
-
-SYM_PREFIX-libgc=GC
-
-# Uncomment the following line to build a GNU win32 DLL
-# include Makefile.DLLs
-
-reserved_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
-		sed s/GC_/_GC_/g < $$file > tmp; \
-		cp tmp $$file; \
-		done
-
-user_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
-		sed s/_GC_/GC_/g < $$file > tmp; \
-		cp tmp $$file; \
-		done
diff --git a/boehm-gc/Makefile.dist b/boehm-gc/Makefile.dist
deleted file mode 100644
index 7105f9353d4..00000000000
--- a/boehm-gc/Makefile.dist
+++ /dev/null
@@ -1,680 +0,0 @@
-# This is the original manually generated Makefile.  It may still be used
-# to build the collector.
-#
-# Primary targets:
-# gc.a - builds basic library
-# c++ - adds C++ interface to library
-# cords - adds cords (heavyweight strings) to library
-# test - prints porting information, then builds basic version of gc.a,
-#      	 and runs some tests of collector and cords.  Does not add cords or
-#	 c++ interface to gc.a
-# cord/de - builds dumb editor based on cords.
-ABI_FLAG= 
-# ABI_FLAG should be the cc flag that specifies the ABI.  On most
-# platforms this will be the empty string.  Possible values:
-# +DD64 for 64-bit executable on HP/UX.
-# -n32, -n64, -o32 for SGI/MIPS ABIs.
-
-AS_ABI_FLAG=$(ABI_FLAG)
-# ABI flag for assembler.  On HP/UX this is +A64 for 64 bit
-# executables.
-
-CC=cc $(ABI_FLAG)
-CXX=g++ $(ABI_FLAG)
-AS=as $(AS_ABI_FLAG)
-#  The above doesn't work with gas, which doesn't run cpp.
-#  Define AS as `gcc -c -x assembler-with-cpp' instead.
-
-# Redefining srcdir allows object code for the nonPCR version of the collector
-# to be generated in different directories.
-srcdir= .
-VPATH= $(srcdir)
-
-CFLAGS= -O -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
-
-# To build the parallel collector on Linux, add to the above:
-# -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
-# To build the parallel collector in a static library on HP/UX,
-# add to the above:
-# -DGC_HPUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC -D_POSIX_C_SOURCE=199506L
-# To build the thread-safe collector on Tru64, add to the above:
-# -pthread -DGC_OSF1_THREADS
-
-# HOSTCC and HOSTCFLAGS are used to build executables that will be run as
-# part of the build process, i.e. on the build machine.  These will usually
-# be the same as CC and CFLAGS, except in a cross-compilation environment.
-# Note that HOSTCFLAGS should include any -D flags that affect thread support.
-HOSTCC=$(CC)
-HOSTCFLAGS=$(CFLAGS)
-
-# For dynamic library builds, it may be necessary to add flags to generate
-# PIC code, e.g. -fPIC on Linux.
-
-# Setjmp_test may yield overly optimistic results when compiled
-# without optimization.
-
-# These define arguments influence the collector configuration:
-# -DSILENT disables statistics printing, and improves performance.
-# -DFIND_LEAK causes GC_find_leak to be initially set.
-#   This causes the collector to assume that all inaccessible
-#   objects should have been explicitly deallocated, and reports exceptions.
-#   Finalization and the test program are not usable in this mode.
-# -DGC_SOLARIS_THREADS enables support for Solaris (thr_) threads.
-#   (Clients should also define GC_SOLARIS_THREADS and then include
-#   gc.h before performing thr_ or dl* or GC_ operations.)
-#   Must also define -D_REENTRANT.
-# -DGC_SOLARIS_PTHREADS enables support for Solaris pthreads.
-#   (Internally this define GC_SOLARIS_THREADS as well.)
-# -DGC_IRIX_THREADS enables support for Irix pthreads.  See README.irix.
-# -DGC_HPUX_THREADS enables support for HP/UX 11 pthreads.
-#   Also requires -D_REENTRANT or -D_POSIX_C_SOURCE=199506L. See README.hp.
-# -DGC_LINUX_THREADS enables support for Xavier Leroy's Linux threads.
-#   see README.linux.  -D_REENTRANT may also be required.
-# -DGC_OSF1_THREADS enables support for Tru64 pthreads.  Untested.
-# -DGC_FREEBSD_THREADS enables support for FreeBSD pthreads.  Untested.
-#   Appeared to run into some underlying thread problems.
-# -DGC_DARWIN_THREADS enables support for Mac OS X pthreads.  Untested.
-# -DGC_DGUX386_THREADS enables support for DB/UX on I386 threads.
-#   See README.DGUX386.
-# -DGC_WIN32_THREADS enables support for win32 threads.  That makes sense
-#   for this Makefile only under Cygwin.
-# -DGC_THREADS should set the appropriate one of the above macros.
-#   It assumes pthreads for Solaris.
-# -DALL_INTERIOR_POINTERS allows all pointers to the interior
-#   of objects to be recognized.  (See gc_priv.h for consequences.)
-#   Alternatively, GC_all_interior_pointers can be set at process
-#   initialization time.
-# -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-#   usually causing it to use less space in such situations.
-#   Incremental collection no longer works in this case.
-# -DLARGE_CONFIG tunes the collector for unusually large heaps.
-#   Necessary for heaps larger than about 500 MB on most machines.
-#   Recommended for heaps larger than about 64 MB.
-# -DDONT_ADD_BYTE_AT_END is meaningful only with -DALL_INTERIOR_POINTERS or
-#   GC_all_interior_pointers = 1.  Normally -DALL_INTERIOR_POINTERS
-#   causes all objects to be padded so that pointers just past the end of
-#   an object can be recognized.  This can be expensive.  (The padding
-#   is normally more than one byte due to alignment constraints.)
-#   -DDONT_ADD_BYTE_AT_END disables the padding.
-# -DNO_SIGNALS does not disable signals during critical parts of
-#   the GC process.  This is no less correct than many malloc 
-#   implementations, and it sometimes has a significant performance
-#   impact.  However, it is dangerous for many not-quite-ANSI C
-#   programs that call things like printf in asynchronous signal handlers.
-#   This is on by default.  Turning it off has not been extensively tested with
-#   compilers that reorder stores.  It should have been.
-# -DNO_EXECUTE_PERMISSION may cause some or all of the heap to not
-#   have execute permission, i.e. it may be impossible to execute
-#   code from the heap.  Currently this only affects the incremental
-#   collector on UNIX machines.  It may greatly improve its performance,
-#   since this may avoid some expensive cache synchronization.
-# -DGC_NO_OPERATOR_NEW_ARRAY declares that the C++ compiler does not support
-#   the  new syntax "operator new[]" for allocating and deleting arrays.
-#   See gc_cpp.h for details.  No effect on the C part of the collector.
-#   This is defined implicitly in a few environments.  Must also be defined
-#   by clients that use gc_cpp.h.
-# -DREDIRECT_MALLOC=X causes malloc to be defined as alias for X.
-#   Unless the following macros are defined, realloc is also redirected
-#   to GC_realloc, and free is redirected to GC_free.
-#   Calloc and strdup are redefined in terms of the new malloc.  X should
-#   be either GC_malloc or GC_malloc_uncollectable, or
-#   GC_debug_malloc_replacement.  (The latter invokes GC_debug_malloc
-#   with dummy source location information, but still results in
-#   properly remembered call stacks on Linux/X86 and Solaris/SPARC.
-#   It requires that the following two macros also be used.)
-#   The former is occasionally useful for working around leaks in code
-#   you don't want to (or can't) look at.  It may not work for
-#   existing code, but it often does.  Neither works on all platforms,
-#   since some ports use malloc or calloc to obtain system memory.
-#   (Probably works for UNIX, and win32.)  If you build with DBG_HDRS_ALL,
-#   you should only use GC_debug_malloc_replacement as a malloc
-#   replacement.
-# -DREDIRECT_REALLOC=X causes GC_realloc to be redirected to X.
-#   The canonical use is -DREDIRECT_REALLOC=GC_debug_realloc_replacement,
-#   together with -DREDIRECT_MALLOC=GC_debug_malloc_replacement to
-#   generate leak reports with call stacks for both malloc and realloc.
-#   This also requires the following:
-# -DREDIRECT_FREE=X causes free to be redirected to X.  The
-#   canonical use is -DREDIRECT_FREE=GC_debug_free.
-# -DIGNORE_FREE turns calls to free into a noop.  Only useful with
-#   -DREDIRECT_MALLOC.
-# -DNO_DEBUGGING removes GC_dump and the debugging routines it calls.
-#   Reduces code size slightly at the expense of debuggability.
-# -DJAVA_FINALIZATION makes it somewhat safer to finalize objects out of
-#   order by specifying a nonstandard finalization mark procedure  (see
-#   finalize.c).  Objects reachable from finalizable objects will be marked
-#   in a sepearte postpass, and hence their memory won't be reclaimed.
-#   Not recommended unless you are implementing a language that specifies
-#   these semantics.  Since 5.0, determines only only the initial value
-#   of GC_java_finalization variable.
-# -DFINALIZE_ON_DEMAND causes finalizers to be run only in response
-#   to explicit GC_invoke_finalizers() calls.
-#   In 5.0 this became runtime adjustable, and this only determines the
-#   initial value of GC_finalize_on_demand.
-# -DATOMIC_UNCOLLECTABLE includes code for GC_malloc_atomic_uncollectable.
-#   This is useful if either the vendor malloc implementation is poor,
-#   or if REDIRECT_MALLOC is used.
-# -DHBLKSIZE=ddd, where ddd is a power of 2 between 512 and 16384, explicitly
-#   sets the heap block size.  Each heap block is devoted to a single size and
-#   kind of object.  For the incremental collector it makes sense to match
-#   the most likely page size.  Otherwise large values result in more
-#   fragmentation, but generally better performance for large heaps.
-# -DUSE_MMAP use MMAP instead of sbrk to get new memory.
-#   Works for Solaris and Irix.
-# -DUSE_MUNMAP causes memory to be returned to the OS under the right
-#   circumstances.  This currently disables VM-based incremental collection.
-#   This is currently experimental, and works only under some Unix,
-#   Linux and Windows versions.
-# -DMMAP_STACKS (for Solaris threads) Use mmap from /dev/zero rather than
-#   GC_scratch_alloc() to get stack memory.
-# -DPRINT_BLACK_LIST Whenever a black list entry is added, i.e. whenever
-#   the garbage collector detects a value that looks almost, but not quite,
-#   like a pointer, print both the address containing the value, and the
-#   value of the near-bogus-pointer.  Can be used to identifiy regions of
-#   memory that are likely to contribute misidentified pointers.
-# -DKEEP_BACK_PTRS Add code to save back pointers in debugging headers
-#   for objects allocated with the debugging allocator.  If all objects
-#   through GC_MALLOC with GC_DEBUG defined, this allows the client
-#   to determine how particular or randomly chosen objects are reachable
-#   for debugging/profiling purposes.  The gc_backptr.h interface is
-#   implemented only if this is defined.
-# -DGC_ASSERTIONS Enable some internal GC assertion checking.  Currently
-#   this facility is only used in a few places.  It is intended primarily
-#   for debugging of the garbage collector itself, but could also
-# -DDBG_HDRS_ALL Make sure that all objects have debug headers.  Increases
-#   the reliability (from 99.9999% to 100% mod. bugs) of some of the debugging
-#   code (especially KEEP_BACK_PTRS).  Makes -DSHORT_DBG_HDRS possible.
-#   Assumes that all client allocation is done through debugging
-#   allocators.
-# -DSHORT_DBG_HDRS Assume that all objects have debug headers.  Shorten
-#   the headers to minimize object size, at the expense of checking for
-#   writes past the end of an object.  This is intended for environments
-#   in which most client code is written in a "safe" language, such as
-#   Scheme or Java.  Assumes that all client allocation is done using
-#   the GC_debug_ functions, or through the macros that expand to these,
-#   or by redirecting malloc to GC_debug_malloc_replacement.
-#   (Also eliminates the field for the requested object size.)
-#   occasionally be useful for debugging of client code.  Slows down the
-#   collector somewhat, but not drastically.
-# -DSAVE_CALL_COUNT=<n> Set the number of call frames saved with objects
-#   allocated through the debugging interface.  Affects the amount of
-#   information generated in leak reports.  Only matters on platforms
-#   on which we can quickly generate call stacks, currently Linux/(X86 & SPARC)
-#   and Solaris/SPARC and platforms that provide execinfo.h.
-#   Default is zero.  On X86, client
-#   code should NOT be compiled with -fomit-frame-pointer.
-# -DSAVE_CALL_NARGS=<n> Set the number of functions arguments to be
-#   saved with each call frame.  Default is zero.  Ignored if we
-#   don't know how to retrieve arguments on the platform.
-# -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-#   altered stubborn objects, at substantial performance cost.
-#   Use only for debugging of the incremental collector.
-# -DGC_GCJ_SUPPORT includes support for gcj (and possibly other systems
-#   that include a pointer to a type descriptor in each allocated object).
-#   Building this way requires an ANSI C compiler.
-# -DUSE_I686_PREFETCH causes the collector to issue Pentium III style
-#   prefetch instructions.  No effect except on X86 Linux platforms.
-#   Assumes a very recent gcc-compatible compiler and assembler.
-#   (Gas prefetcht0 support was added around May 1999.)
-#   Empirically the code appears to still run correctly on Pentium II
-#   processors, though with no performance benefit.  May not run on other
-#   X86 processors?  In some cases this improves performance by
-#   15% or so.
-# -DUSE_3DNOW_PREFETCH causes the collector to issue AMD 3DNow style
-#   prefetch instructions.  Same restrictions as USE_I686_PREFETCH.
-#   Minimally tested.  Didn't appear to be an obvious win on a K6-2/500.
-# -DUSE_PPC_PREFETCH causes the collector to issue PowerPC style
-#   prefetch instructions.  No effect except on PowerPC OS X platforms.
-#   Performance impact untested.
-# -DGC_USE_LD_WRAP in combination with the old flags listed in README.linux
-#   causes the collector some system and pthread calls in a more transparent
-#   fashion than the usual macro-based approach.  Requires GNU ld, and
-#   currently probably works only with Linux.
-# -DTHREAD_LOCAL_ALLOC defines GC_local_malloc(), GC_local_malloc_atomic()
-#   and GC_local_gcj_malloc().  Needed for gc_gcj.h interface.  These allocate
-#   in a way that usually does not involve acquisition of a global lock.
-#   Currently requires -DGC_LINUX_THREADS, but should be easy to port to
-#   other pthreads environments.  Recommended for multiprocessors.
-# -DUSE_COMPILER_TLS causes thread local allocation to use compiler-supported
-#   "__thread" thread-local variables.  This is the default in HP/UX.  It
-#   may help performance on recent Linux installations.  (It failed for
-#   me on RedHat 8, but appears to work on RedHat 9.)
-# -DPARALLEL_MARK allows the marker to run in multiple threads.  Recommended
-#   for multiprocessors.  Currently requires Linux on X86 or IA64, though
-#   support for other Posix platforms should be fairly easy to add,
-#   if the thread implementation is otherwise supported.
-# -DNO_GETENV prevents the collector from looking at environment variables.
-#   These may otherwise alter its configuration, or turn off GC altogether.
-#   I don't know of a reason to disable this, except possibly if the
-#   resulting process runs as a privileged user?
-# -DUSE_GLOBAL_ALLOC.  Win32 only.  Use GlobalAlloc instead of
-#   VirtualAlloc to allocate the heap.  May be needed to work around
-#   a Windows NT/2000 issue.  Incompatible with USE_MUNMAP.
-#   See README.win32 for details.
-# -DMAKE_BACK_GRAPH. Enable GC_PRINT_BACK_HEIGHT environment variable.
-#   See README.environment for details.  Experimental. Limited platform
-#   support.  Implies DBG_HDRS_ALL.  All allocation should be done using
-#   the debug interface.
-# -DSTUBBORN_ALLOC allows allocation of "hard to change" objects, and thus
-#   makes incremental collection easier.  Was enabled by default until 6.0.
-#   Rarely used, to my knowledge.
-# -DHANDLE_FORK attempts to make GC_malloc() work in a child process fork()ed
-#   from a multithreaded parent.  Currently only supported by pthread_support.c.
-#   (Similar code should work on Solaris or Irix, but it hasn't been tried.)
-# -DTEST_WITH_SYSTEM_MALLOC causes gctest to allocate (and leak) large chunks
-#   of memory with the standard system malloc.  This will cause the root
-#   set and collected heap to grow significantly if malloced memory is
-#   somehow getting traced by the collector.  This has no impact on the
-#   generated library; it only affects the test.
-# -DPOINTER_MASK=0x... causes candidate pointers to be ANDed with the
-#   given mask before being considered.  If either this or the following
-#   macro is defined, it will be assumed that all pointers stored in
-#   the heap need to be processed this way.  Stack and register pointers
-#   will be considered both with and without processing.
-#   These macros are normally needed only to support systems that use
-#   high-order pointer tags. EXPERIMENTAL.
-# -DPOINTER_SHIFT=n causes the collector to left shift candidate pointers
-#   by the indicated amount before trying to interpret them.  Applied
-#   after POINTER_MASK. EXPERIMENTAL.  See also the preceding macro.
-#
-
-CXXFLAGS= $(CFLAGS) 
-AR= ar
-RANLIB= ranlib
-
-
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o aix_irix_threads.o pthread_support.o pthread_stop_world.o darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o gc_dlopen.o backgraph.o win32_threads.o
-
-CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c aix_irix_threads.c pthread_support.c pthread_stop_world.c darwin_stop_world.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c gc_dlopen.c backgraph.c win32_threads.c
-
-CORD_SRCS=  cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC
-
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
-
-SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
-    sparc_mach_dep.S include/gc.h include/gc_typed.h \
-    include/private/gc_hdrs.h include/private/gc_priv.h \
-    include/private/gcconfig.h include/private/gc_pmark.h \
-    include/gc_inl.h include/gc_inline.h include/gc_mark.h \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
-    gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
-    include/new_gc_alloc.h include/gc_allocator.h \
-    include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
-    include/private/solaris_threads.h include/gc_backptr.h \
-    hpux_test_and_clear.s include/gc_gcj.h \
-    include/gc_local_alloc.h include/private/dbg_mlc.h \
-    include/private/specific.h powerpc_darwin_mach_dep.s \
-    include/leak_detector.h include/gc_amiga_redirects.h \
-    include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
-    include/gc_config_macros.h include/private/pthread_support.h \
-    include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
-    include/private/darwin_stop_world.h $(CORD_SRCS)
-
-DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
-	doc/README.amiga doc/README.cords doc/debugging.html \
-	doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
-	doc/README.sgi doc/README.solaris2 doc/README.uts \
-	doc/README.win32 doc/barrett_diagram doc/README \
-        doc/README.contributors doc/README.changes doc/gc.man \
-	doc/README.environment doc/tree.html doc/gcdescr.html \
-	doc/README.autoconf doc/README.macros doc/README.ews4800 \
-	doc/README.DGUX386 doc/README.arm.cross doc/leak.html \
-	doc/scale.html doc/gcinterface.html doc/README.darwin \
-	doc/simple_example.html
-
-TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
-	tests/leak_test.c tests/thread_leak_test.c tests/middle.c
-
-GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
-		 libtool.m4 install-sh configure.host Makefile.in \
-		 aclocal.m4 config.sub config.guess \
-		 include/Makefile.am include/Makefile.in \
-		 doc/Makefile.am doc/Makefile.in \
-		 ltmain.sh mkinstalldirs depcomp missing
-
-OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \
-		 BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \
-		 PCR-Makefile SMakefile.amiga Makefile.DLLs \
-		 digimars.mak Makefile.direct NT_STATIC_THREADS_MAKEFILE
-#	Makefile and Makefile.direct are copies of each other.
-
-OTHER_FILES= Makefile setjmp_t.c callprocs pc_excludes \
-           MacProjects.sit.hqx MacOS.c \
-           Mac_files/datastart.c Mac_files/dataend.c \
-           Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-	   version.h AmigaOS.c \
-	   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
-
-CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
-
-UTILS= if_mach if_not_there threadlibs
-
-# Libraries needed for curses applications.  Only needed for de.
-CURSES= -lcurses -ltermlib
-
-# The following is irrelevant on most systems.  But a few
-# versions of make otherwise fork the shell specified in
-# the SHELL environment variable.
-SHELL= /bin/sh
-
-SPECIALCFLAGS = -I$(srcdir)/include
-# Alternative flags to the C compiler for mach_dep.c.
-# Mach_dep.c often doesn't like optimization, and it's
-# not time-critical anyway.
-# Set SPECIALCFLAGS to -q nodirect_code on Encore.
-
-all: gc.a gctest
-
-LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
-
-BSD-pkg-all: bsd-libgc.a bsd-libleak.a
-
-bsd-libgc.a:
-	$(MAKE) CFLAGS="$(CFLAGS)" clean c++-t
-	mv gc.a bsd-libgc.a
-
-bsd-libleak.a:
-	$(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt
-	mv gc.a bsd-libleak.a
-
-BSD-pkg-install: BSD-pkg-all
-	${CP} bsd-libgc.a libgc.a
-	${INSTALL_DATA} libgc.a ${PREFIX}/lib
-	${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
-	${INSTALL_MAN} doc/gc.man ${PREFIX}/man/man3/gc.3
-
-pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \
-include/private/gc_locks.h include/gc.h include/private/gcconfig.h \
-mach_dep.o $(SRCS)
-	$(MAKE) -f PCR-Makefile depend
-	$(MAKE) -f PCR-Makefile
-
-$(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \
-    $(srcdir)/include/private/gc_priv.h \
-    $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \
-    $(srcdir)/include/gc.h $(srcdir)/include/gc_pthread_redirects.h \
-    $(srcdir)/include/private/gcconfig.h $(srcdir)/include/gc_typed.h \
-    $(srcdir)/include/gc_config_macros.h Makefile
-# The dependency on Makefile is needed.  Changing
-# options such as -DSILENT affects the size of GC_arrays,
-# invalidating all .o files that rely on gc_priv.h
-
-mark.o typd_mlc.o finalize.o ptr_chck.o: $(srcdir)/include/gc_mark.h $(srcdir)/include/private/gc_pmark.h
-
-specific.o pthread_support.o: $(srcdir)/include/private/specific.h
-
-solaris_threads.o solaris_pthreads.o: $(srcdir)/include/private/solaris_threads.h
-
-dbg_mlc.o gcj_mlc.o: $(srcdir)/include/private/dbg_mlc.h
-
-tests/test.o: tests $(srcdir)/tests/test.c
-	$(CC) $(CFLAGS) -c $(srcdir)/tests/test.c
-	mv test.o tests/test.o
-
-tests:
-	mkdir tests
-
-base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
-	echo > base_lib
-	rm -f dont_ar_1
-	./if_mach SPARC SUNOS5 touch dont_ar_1
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o
-	./if_mach M68K AMIGA touch dont_ar_1
-	./if_mach M68K AMIGA $(AR) -vrus gc.a $(OBJS) dyn_load.o
-	./if_not_there dont_ar_1 $(AR) ru gc.a $(OBJS) dyn_load.o
-	./if_not_there dont_ar_1 $(RANLIB) gc.a || cat /dev/null
-#	ignore ranlib failure; that usually means it doesn't exist, and isn't needed
-
-cords: $(CORD_OBJS) cord/cordtest $(UTILS)
-	rm -f dont_ar_3
-	./if_mach SPARC SUNOS5 touch dont_ar_3
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS)
-	./if_mach M68K AMIGA touch dont_ar_3
-	./if_mach M68K AMIGA $(AR) -vrus gc.a $(CORD_OBJS)
-	./if_not_there dont_ar_3 $(AR) ru gc.a $(CORD_OBJS)
-	./if_not_there dont_ar_3 $(RANLIB) gc.a || cat /dev/null
-
-gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h Makefile
-	$(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc
-
-test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \
-base_lib $(UTILS)
-	rm -f test_cpp
-	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs`
-	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
-
-c++-t: c++
-	./test_cpp 1
-
-c++-nt: c++
-	@echo "Use ./test_cpp 1 to test the leak library"
-
-c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp
-	rm -f dont_ar_4
-	./if_mach SPARC SUNOS5 touch dont_ar_4
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-	./if_mach M68K AMIGA touch dont_ar_4
-	./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
-	./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
-	./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null
-	./test_cpp 1
-	echo > c++
-
-dyn_load_sunos53.o: dyn_load.c
-	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
-
-# SunOS5 shared library version of the collector
-sunos5gc.so: $(OBJS) dyn_load_sunos53.o
-	$(CC) -G -o sunos5gc.so $(OBJS) dyn_load_sunos53.o -ldl
-	ln sunos5gc.so libgc.so
-
-# Alpha/OSF shared library version of the collector
-libalphagc.so: $(OBJS)
-	ld -shared -o libalphagc.so $(OBJS) dyn_load.o -lc
-	ln libalphagc.so libgc.so
-
-# IRIX shared library version of the collector
-libirixgc.so: $(OBJS) dyn_load.o
-	ld -shared $(ABI_FLAG) -o libirixgc.so $(OBJS) dyn_load.o -lc
-	ln libirixgc.so libgc.so
-
-# Linux shared library version of the collector
-liblinuxgc.so: $(OBJS) dyn_load.o
-	gcc -shared -o liblinuxgc.so $(OBJS) dyn_load.o
-	ln liblinuxgc.so libgc.so
-
-# Alternative Linux rule.  This is preferable, but is likely to break the
-# Makefile for some non-linux platforms.
-# LIBOBJS= $(patsubst %.o, %.lo, $(OBJS))
-#
-#.SUFFIXES: .lo $(SUFFIXES)
-#
-#.c.lo:
-#	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
-#
-# liblinuxgc.so: $(LIBOBJS) dyn_load.lo
-# 	gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo
-#	touch liblinuxgc.so
-
-mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.s \
-	    $(srcdir)/mips_ultrix_mach_dep.s \
-            $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s \
-	    $(srcdir)/sparc_mach_dep.S $(srcdir)/sparc_sunos4_mach_dep.s \
-	    $(srcdir)/ia64_save_regs_in_stack.s \
-	    $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS)
-	rm -f mach_dep.o
-	./if_mach MIPS IRIX5 $(CC) -c -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.s
-	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach POWERPC DARWIN $(AS) -o mach_dep.o $(srcdir)/powerpc_darwin_mach_dep.s
-	./if_mach ALPHA LINUX $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
-	./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep.o $(srcdir)/sparc_mach_dep.S
-	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-	./if_mach SPARC NETBSD $(AS) -o mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s
-	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-	./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-	./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o
-	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-
-mark_rts.o: $(srcdir)/mark_rts.c $(UTILS)
-	rm -f mark_rts.o
-	-./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
-	./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
-#	Work-around for DEC optimizer tail recursion elimination bug.
-#  The ALPHA-specific line should be removed if gcc is used.
-
-alloc.o: version.h
-
-cord:
-	mkdir cord
-
-cord/cordbscs.o: cord $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c
-	mv cordbscs.o cord/cordbscs.o
-#  not all compilers understand -o filename
-
-cord/cordxtra.o: cord $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c
-	mv cordxtra.o cord/cordxtra.o
-
-cord/cordprnt.o: cord $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c
-	mv cordprnt.o cord/cordprnt.o
-
-cord/cordtest: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS)
-	rm -f cord/cordtest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-	./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-
-cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS)
-	rm -f cord/de
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs`
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld `./threadlibs`
-	./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a
-	./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
-
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
-
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
-
-if_not_there: $(srcdir)/if_not_there.c
-	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
-
-clean: 
-	rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
-	      setjmp_test  mon.out gmon.out a.out core if_not_there if_mach \
-	      threadlibs $(CORD_OBJS) cord/cordtest cord/de 
-	-rm -f *~
-
-gctest: tests/test.o gc.a $(UTILS)
-	rm -f gctest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest  tests/test.o gc.a `./threadlibs`
-	./if_not_there gctest $(CC) $(CFLAGS) -o gctest tests/test.o gc.a `./threadlibs`
-
-# If an optimized setjmp_test generates a segmentation fault,
-# odds are your compiler is broken.  Gctest may still work.
-# Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
-
-test:  KandRtest cord/cordtest
-	cord/cordtest
-
-# Those tests that work even with a K&R C compiler:
-KandRtest: setjmp_test gctest
-	./setjmp_test
-	./gctest
-
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/version.h
-	$(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
-
-gcname: $(srcdir)/gcname.c $(srcdir)/version.h
-	$(CC) -o gcname $(srcdir)/gcname.c
-
-gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname
-	cp Makefile Makefile.old
-	cp Makefile.direct Makefile
-	rm -f `./gcname`
-	ln -s . `./gcname`
-	./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) > /tmp/gc.tar-files
-	tar cvfh gc.tar `cat /tmp/gc.tar-files`
-	cp gc.tar `./gcname`.tar
-	gzip `./gcname`.tar
-	rm `./gcname`
-
-pc_gc.tar: $(SRCS) $(OTHER_FILES)
-	tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES)
-
-floppy: pc_gc.tar
-	-mmd a:/cord
-	-mmd a:/cord/private
-	-mmd a:/include
-	-mmd a:/include/private
-	mkdir /tmp/pc_gc
-	cat pc_gc.tar | (cd /tmp/pc_gc; tar xvf -)
-	-mcopy -tmn /tmp/pc_gc/* a:
-	-mcopy -tmn /tmp/pc_gc/cord/* a:/cord
-	-mcopy -mn /tmp/pc_gc/cord/de_win.ICO a:/cord
-	-mcopy -tmn /tmp/pc_gc/cord/private/* a:/cord/private
-	-mcopy -tmn /tmp/pc_gc/include/* a:/include
-	-mcopy -tmn /tmp/pc_gc/include/private/* a:/include/private
-	rm -r /tmp/pc_gc
-
-gc.tar.Z: gc.tar
-	compress gc.tar
-
-gc.tar.gz: gc.tar
-	gzip gc.tar
-
-lint: $(CSRCS) tests/test.c
-	lint -DLINT $(CSRCS) tests/test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall|change in ANSI|improper alignment"
-
-# BTL: added to test shared library version of collector.
-# Currently works only under SunOS5.  Requires GC_INIT call from statically
-# loaded client code.
-ABSDIR = `pwd`
-gctest_dyn_link: tests/test.o libgc.so
-	$(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link tests/test.o -lgc -ldl -lthread
-
-gctest_irix_dyn_link: tests/test.o libirixgc.so
-	$(CC) -L$(ABSDIR) -o gctest_irix_dyn_link tests/test.o -lirixgc
-
-# The following appear to be dead, especially since libgc_globals.h
-# is apparently lost.
-test_dll.o: tests/test.c libgc_globals.h
-	$(CC) $(CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.o
-
-test_dll: test_dll.o libgc_dll.a libgc.dll
-	$(CC) test_dll.o -L$(ABSDIR) -lgc_dll -o test_dll
-
-SYM_PREFIX-libgc=GC
-
-# Uncomment the following line to build a GNU win32 DLL
-# include Makefile.DLLs
-
-reserved_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
-		sed s/GC_/_GC_/g < $$file > tmp; \
-		cp tmp $$file; \
-		done
-
-user_namespace: $(SRCS)
-	for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \
-		sed s/_GC_/GC_/g < $$file > tmp; \
-		cp tmp $$file; \
-		done
diff --git a/boehm-gc/Makefile.dj b/boehm-gc/Makefile.dj
deleted file mode 100644
index 7757f15133d..00000000000
--- a/boehm-gc/Makefile.dj
+++ /dev/null
@@ -1,430 +0,0 @@
-# This Makefile is intended only for DJGPP use.
-# It is mainly a copy of the main Makefile, but tends to get out of sync
-# with it.  A merge would probably be appropriate.
-
-# Primary targets:
-# gc.a - builds basic library
-# libgc.a - builds library for use with g++ "-fgc-keyword" extension
-#	    -fgc-keyword was never really available.  Historical
-#	    interest only.
-# c++ - adds C++ interface to library
-# cords - adds cords (heavyweight strings) to library
-# test - prints porting information, then builds basic version of gc.a,
-#      	 and runs some tests of collector and cords.  Does not add cords or
-#	 c++ interface to gc.a
-# cord/de$(EXE_SUFFIX) - builds dumb editor based on cords.
-ABI_FLAG=
-CC=gcc $(ABI_FLAG)
-CXX=gxx $(ABI_FLAG)
-AS=gcc -c -x assembler-with-cpp $(ABI_FLAG)
-#  The above doesn't work with gas, which doesn't run cpp.
-#  Define AS as `gcc -c -x assembler-with-cpp' instead.
-#  Under Irix 6, you will have to specify the ABI (-o32, -n32, or -64)
-#  if you use something other than the default ABI on your machine.
-
-# special defines for DJGPP
-CXXLD=gxx $(ABI_FLAG)
-EXE_SUFFIX=.exe
-
-srcdir= .
-VPATH= $(srcdir)
-
-CFLAGS= -gstabs+ -O2 -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DSILENT
-
-# Setjmp_test may yield overly optimistic results when compiled
-# without optimization.
-# -DSILENT disables statistics printing, and improves performance.
-# -DFIND_LEAK causes GC_find_leak to be initially set.
-#   This causes the collector to assume that all inaccessible
-#   objects should have been explicitly deallocated, and reports exceptions.
-#   Finalization and the test program are not usable in this mode.
-# -DALL_INTERIOR_POINTERS allows all pointers to the interior
-#   of objects to be recognized.  (See gc_priv.h for consequences.)
-# -DSMALL_CONFIG tries to tune the collector for small heap sizes,
-#   usually causing it to use less space in such situations.
-#   Incremental collection no longer works in this case.
-# -DLARGE_CONFIG tunes the collector for unusually large heaps.
-#   Necessary for heaps larger than about 500 MB on most machines.
-#   Recommended for heaps larger than about 64 MB.
-# -DDONT_ADD_BYTE_AT_END is meaningful only with
-#   -DALL_INTERIOR_POINTERS.  Normally -DALL_INTERIOR_POINTERS
-#   causes all objects to be padded so that pointers just past the end of
-#   an object can be recognized.  This can be expensive.  (The padding
-#   is normally more than one byte due to alignment constraints.)
-#   -DDONT_ADD_BYTE_AT_END disables the padding.
-# -DNO_SIGNALS does not disable signals during critical parts of
-#   the GC process.  This is no less correct than many malloc 
-#   implementations, and it sometimes has a significant performance
-#   impact.  However, it is dangerous for many not-quite-ANSI C
-#   programs that call things like printf in asynchronous signal handlers.
-#   This is on by default.  Turning it off has not been extensively tested with
-#   compilers that reorder stores.  It should have been.
-# -DNO_EXECUTE_PERMISSION may cause some or all of the heap to not
-#   have execute permission, i.e. it may be impossible to execute
-#   code from the heap.  Currently this only affects the incremental
-#   collector on UNIX machines.  It may greatly improve its performance,
-#   since this may avoid some expensive cache synchronization.
-# -DGC_NO_OPERATOR_NEW_ARRAY declares that the C++ compiler does not support
-#   the  new syntax "operator new[]" for allocating and deleting arrays.
-#   See gc_cpp.h for details.  No effect on the C part of the collector.
-#   This is defined implicitly in a few environments.  Must also be defined
-#   by clients that use gc_cpp.h.
-# -DREDIRECT_MALLOC=X causes malloc, realloc, and free to be defined
-#   as aliases for X, GC_realloc, and GC_free, respectively.
-#   Calloc is redefined in terms of the new malloc.  X should
-#   be either GC_malloc or GC_malloc_uncollectable.
-#   The former is occasionally useful for working around leaks in code
-#   you don't want to (or can't) look at.  It may not work for
-#   existing code, but it often does.  Neither works on all platforms,
-#   since some ports use malloc or calloc to obtain system memory.
-#   (Probably works for UNIX, and win32.)
-# -DIGNORE_FREE turns calls to free into a noop.  Only useful with
-#   -DREDIRECT_MALLOC.
-# -DNO_DEBUGGING removes GC_dump and the debugging routines it calls.
-#   Reduces code size slightly at the expense of debuggability.
-# -DJAVA_FINALIZATION makes it somewhat safer to finalize objects out of
-#   order by specifying a nonstandard finalization mark procedure  (see
-#   finalize.c).  Objects reachable from finalizable objects will be marked
-#   in a sepearte postpass, and hence their memory won't be reclaimed.
-#   Not recommended unless you are implementing a language that specifies
-#   these semantics.  Since 5.0, determines only only the initial value
-#   of GC_java_finalization variable.
-# -DFINALIZE_ON_DEMAND causes finalizers to be run only in response
-#   to explicit GC_invoke_finalizers() calls.
-#   In 5.0 this became runtime adjustable, and this only determines the
-#   initial value of GC_finalize_on_demand.
-# -DATOMIC_UNCOLLECTABLE includes code for GC_malloc_atomic_uncollectable.
-#   This is useful if either the vendor malloc implementation is poor,
-#   or if REDIRECT_MALLOC is used.
-# -DHBLKSIZE=ddd, where ddd is a power of 2 between 512 and 16384, explicitly
-#   sets the heap block size.  Each heap block is devoted to a single size and
-#   kind of object.  For the incremental collector it makes sense to match
-#   the most likely page size.  Otherwise large values result in more
-#   fragmentation, but generally better performance for large heaps.
-# -DPRINT_BLACK_LIST Whenever a black list entry is added, i.e. whenever
-#   the garbage collector detects a value that looks almost, but not quite,
-#   like a pointer, print both the address containing the value, and the
-#   value of the near-bogus-pointer.  Can be used to identifiy regions of
-#   memory that are likely to contribute misidentified pointers.
-# -DKEEP_BACK_PTRS Add code to save back pointers in debugging headers
-#   for objects allocated with the debugging allocator.  If all objects
-#   through GC_MALLOC with GC_DEBUG defined, this allows the client
-#   to determine how particular or randomly chosen objects are reachable
-#   for debugging/profiling purposes.  The gc_backptr.h interface is
-#   implemented only if this is defined.
-# -DGC_ASSERTIONS Enable some internal GC assertion checking.  Currently
-#   this facility is only used in a few places.  It is intended primarily
-#   for debugging of the garbage collector itself, but could also
-# -DDBG_HDRS_ALL Make sure that all objects have debug headers.  Increases
-#   the reliability (from 99.9999% to 100%) of some of the debugging
-#   code (especially KEEP_BACK_PTRS).  Makes -DSHORT_DBG_HDRS possible.
-#   Assumes that all client allocation is done through debugging
-#   allocators.
-# -DSHORT_DBG_HDRS Assume that all objects have debug headers.  Shorten
-#   the headers to minimize object size, at the expense of checking for
-#   writes past the end of an object.  This is intended for environments
-#   in which most client code is written in a "safe" language, such as
-#   Scheme or Java.  Assumes that all client allocation is done using
-#   the GC_debug_ functions (or through the macros that expand to these.
-#   (Also eliminates the field for the requested object size.)
-#   occasionally be useful for debugging of client code.  Slows down the
-#   collector somewhat, but not drastically.
-# -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly
-#   altered stubborn objects, at substantial performance cost.
-#   Use only for debugging of the incremental collector.
-# -DGC_GCJ_SUPPORT includes support for gcj (and possibly other systems
-#   that include a pointer to a type descriptor in each allocated object).
-#   Building this way requires an ANSI C compiler.
-# -DUSE_I686_PREFETCH causes the collector to issue Pentium III style
-#   prefetch instructions.  No effect except on X86 Linux platforms.
-#   Assumes a very recent gcc-compatible compiler and assembler.
-#   (Gas prefetcht0 support was added around May 1999.)
-#   Empirically the code appears to still run correctly on Pentium II
-#   processors, though with no performance benefit.  May not run on other
-#   X86 processors?  In some cases this improves performance by
-#   15% or so.
-# -DUSE_3DNOW_PREFETCH causes the collector to issue AMD 3DNow style
-#   prefetch instructions.  Same restrictions as USE_I686_PREFETCH.
-#   UNTESTED!!
-# -DGC_USE_LD_WRAP in combination with the gld flags listed in README.linux
-#   causes the collector some system and pthread calls in a more transparent
-#   fashion than the usual macro-based approach.  Requires GNU ld, and
-#   currently probably works only with Linux.
-
-
-CXXFLAGS= $(CFLAGS) -DGC_OPERATOR_NEW_ARRAY
-AR= ar
-RANLIB= ranlib
-
-
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o
-
-CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c
-
-CORD_SRCS=  cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC cord/SCOPTIONS.amiga cord/SMakefile.amiga
-
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
-
-SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
-    sparc_mach_dep.S include/gc.h include/gc_typed.h \
-    include/private/gc_hdrs.h include/private/gc_priv.h \
-    include/private/gcconfig.h include/private/gc_mark.h \
-    include/gc_inl.h include/gc_inline.h gc.man \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    include/weakpointer.h include/private/gc_locks.h \
-    gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
-    include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
-    include/private/solaris_threads.h include/gc_backptr.h \
-    hpux_test_and_clear.s include/gc_gcj.h \
-    include/gc_local_alloc.h include/private/dbg_mlc.h \
-    include/private/specific.h powerpc_darwin_mach_dep.s \
-    include/leak_detector.h $(CORD_SRCS)
-
-OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
-           README tests/test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
-           SCoptions.amiga README.amiga README.win32 cord/README \
-	   README.rs6000 README.QUICK callprocs pc_excludes \
-           barrett_diagram README.OS2 README.Mac MacProjects.sit.hqx \
-           MacOS.c EMX_MAKEFILE README.debugging \
-           Mac_files/datastart.c Mac_files/dataend.c \
-           Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c README.solaris2 README.sgi README.hp README.uts \
-	   win32_threads.c NT_THREADS_MAKEFILE gc.mak README.dj Makefile.dj \
-	   README.alpha README.linux README.MacOSX version.h Makefile.DLLs \
-	   WCC_MAKEFILE nursery.c include/gc_nursery.h include/gc_copy_descr.h
-
-CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
-
-UTILS= if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
-
-# Libraries needed for curses applications.  Only needed for de.
-CURSES= -lcurses -ltermlib
-
-# The following is irrelevant on most systems.  But a few
-# versions of make otherwise fork the shell specified in
-# the SHELL environment variable.
-SHELL= /bin/sh
-
-SPECIALCFLAGS = -I$(srcdir)/include
-# Alternative flags to the C compiler for mach_dep.c.
-# Mach_dep.c often doesn't like optimization, and it's
-# not time-critical anyway.
-# Set SPECIALCFLAGS to -q nodirect_code on Encore.
-
-all: gc.a gctest$(EXE_SUFFIX)
-
-$(OBJS) test.o dyn_load.o dyn_load_sunos53.o: \
-    $(srcdir)/include/private/gc_priv.h \
-    $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \
-    $(srcdir)/include/gc.h \
-    $(srcdir)/include/private/gcconfig.h $(srcdir)/include/gc_typed.h \
-    Makefile
-# The dependency on Makefile is needed.  Changing
-# options such as -DSILENT affects the size of GC_arrays,
-# invalidating all .o files that rely on gc_priv.h
-
-mark.o typd_mlc.o finalize.o: $(srcdir)/include/gc_mark.h
-
-base_lib gc.a: $(OBJS) dyn_load.o $(UTILS)
-	echo > base_lib
-	rm -f on_sparc_sunos5_1
-	./if_mach SPARC SUNOS5 touch on_sparc_sunos5_1
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o
-	./if_not_there on_sparc_sunos5_1 $(AR) ru gc.a $(OBJS) dyn_load.o
-	-./if_not_there on_sparc_sunos5_1 $(RANLIB) gc.a
-#	ignore ranlib failure; that usually means it doesn't exist, and isn't needed
-
-cords: $(CORD_OBJS) cord/cordtest$(EXE_SUFFIX) $(UTILS)
-	rm -f on_sparc_sunos5_3
-	./if_mach SPARC SUNOS5 touch on_sparc_sunos5_3
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS)
-	./if_not_there on_sparc_sunos5_3 $(AR) ru gc.a $(CORD_OBJS)
-	-./if_not_there on_sparc_sunos5_3 $(RANLIB) gc.a
-
-gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h Makefile
-	$(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc
-
-test_cpp$(EXE_SUFFIX): $(srcdir)/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \
-base_lib $(UTILS)
-	rm -f test_cpp test_cpp$(EXE_SUFFIX)
-	./if_mach HP_PA "" $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld
-	./if_not_there test_cpp$(EXE_SUFFIX) $(CXXLD) $(CXXFLAGS) -o test_cpp$(EXE_SUFFIX) $(srcdir)/test_cpp.cc gc_cpp.o gc.a
-	rm -f test_cpp
-
-c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp$(EXE_SUFFIX)
-	rm -f on_sparc_sunos5_4
-	./if_mach SPARC SUNOS5 touch on_sparc_sunos5_4
-	./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o
-	./if_not_there on_sparc_sunos5_4 $(AR) ru gc.a gc_cpp.o
-	-./if_not_there on_sparc_sunos5_4 $(RANLIB) gc.a
-	./test_cpp$(EXE_SUFFIX) 1
-	echo > c++
-
-dyn_load_sunos53.o: dyn_load.c
-	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
-
-# SunOS5 shared library version of the collector
-sunos5gc.so: $(OBJS) dyn_load_sunos53.o
-	$(CC) -G -o sunos5gc.so $(OBJS) dyn_load_sunos53.o -ldl
-	ln sunos5gc.so libgc.so
-
-# Alpha/OSF shared library version of the collector
-libalphagc.so: $(OBJS)
-	ld -shared -o libalphagc.so $(OBJS) dyn_load.o -lc
-	ln libalphagc.so libgc.so
-
-# IRIX shared library version of the collector
-libirixgc.so: $(OBJS) dyn_load.o
-	ld -shared $(ABI_FLAG) -o libirixgc.so $(OBJS) dyn_load.o -lc
-	ln libirixgc.so libgc.so
-
-# Linux shared library version of the collector
-liblinuxgc.so: $(OBJS) dyn_load.o
-	gcc -shared -o liblinuxgc.so $(OBJS) dyn_load.o -lo
-	ln liblinuxgc.so libgc.so
-
-mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.S $(srcdir)/mips_ultrix_mach_dep.s \
-            $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s $(UTILS)
-	rm -f mach_dep.o
-	./if_mach MIPS IRIX5 $(AS) -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.S
-	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
-	./if_mach RS6000 "" $(AS) -o mach_dep.o $(srcdir)/rs6000_mach_dep.s
-	./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_darwin_mach_dep.s
-	./if_mach ALPHA "" $(AS) -o mach_dep.o $(srcdir)/alpha_mach_dep.S
-	./if_mach SPARC SUNOS5 $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.S
-	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-
-mark_rts.o: $(srcdir)/mark_rts.c if_mach if_not_there $(UTILS)
-	rm -f mark_rts.o
-	-./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
-	./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
-#	Work-around for DEC optimizer tail recursion elimination bug.
-#  The ALPHA-specific line should be removed if gcc is used.
-
-alloc.o: version.h
-
-cord/cordbscs.o: $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c
-	mv cordbscs.o cord/cordbscs.o
-#  not all compilers understand -o filename
-
-cord/cordxtra.o: $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c
-	mv cordxtra.o cord/cordxtra.o
-
-cord/cordprnt.o: $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c
-	mv cordprnt.o cord/cordprnt.o
-
-cord/cordtest$(EXE_SUFFIX): $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS) /tmp
-	rm -f cord/cordtest$(EXE_SUFFIX)
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb
-	./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld
-	./if_not_there cord/cordtest$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a
-	rm -f cord/cordtest cordtest
-	-mv cordtest$(EXE_SUFFIX) cord/
-
-/tmp: $(UTILS)
-	./if_not_there /tmp mkdir /tmp
-
-cord/de$(EXE_SUFFIX): $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS)
-	rm -f cord/de cord/de$(EXE_SUFFIX)
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs`
-	./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld
-	./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs`
-	./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-	./if_not_there cord/de$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/de$(EXE_SUFFIX) $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES)
-
-if_mach$(EXE_SUFFIX): $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-	rm -f if_mach if_mach$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o if_mach $(srcdir)/if_mach.c
-
-threadlibs$(EXE_SUFFIX): $(srcdir)/threadlibs.c $(srcdir)include/private/gcconfig.h Makefile
-	rm -f threadlibs threadlibs$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o threadlibs $(srcdir)/threadlibs.c
-
-if_not_there$(EXE_SUFFIX): $(srcdir)/if_not_there.c
-	rm -f if_not_there if_not_there$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o if_not_there $(srcdir)/if_not_there.c
-
-# Clean removes *.o several times,
-# because as the first one doesn't seem to get them all!
-clean: 
-	rm -f gc.a *.o
-	rm -f *.o
-	rm -f *.o
-	rm -f cord/*.o
-	rm -f gctest gctest_dyn_link test_cpp
-	rm -f setjmp_test  mon.out gmon.out a.out core if_not_there if_mach
-	rm -f threadlibs $(CORD_OBJS) cordtest cord/cordtest de cord/de
-	rm -f gctest$(EXE_SUFFIX) gctest_dyn_link$(EXE_SUFFIX) test_cpp$(EXE_SUFFIX)
-	rm -f setjmp_test$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX) if_mach$(EXE_SUFFIX)
-	rm -f threadlibs$(EXE_SUFFIX) cord/cordtest$(EXE_SUFFIX)
-	-rm -f *~
-
-gctest$(EXE_SUFFIX): tests/test.o gc.a if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
-	rm -f gctest gctest$(EXE_SUFFIX)
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -lucb
-	./if_mach HP_PA "" $(CC) $(CFLAGS) -o gctest  tests/test.o gc.a -ldld
-	./if_not_there gctest$(EXE_SUFFIX) $(CC) $(CFLAGS) -o gctest$(EXE_SUFFIX) tests/test.o gc.a
-	rm -f gctest
-
-# If an optimized setjmp_test generates a segmentation fault,
-# odds are your compiler is broken.  Gctest may still work.
-# Try compiling setjmp_t.c unoptimized.
-setjmp_test$(EXE_SUFFIX): $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h \
-		if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
-	rm -f setjmp_test$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
-	rm -f setjmp_test
-
-test:  KandRtest cord/cordtest$(EXE_SUFFIX)
-	./cord/cordtest$(EXE_SUFFIX)
-
-# Those tests that work even with a K&R C compiler:
-KandRtest: setjmp_test$(EXE_SUFFIX) gctest$(EXE_SUFFIX)
-	./setjmp_test$(EXE_SUFFIX)
-	./gctest$(EXE_SUFFIX)
-
-add_gc_prefix$(EXE_SUFFIX): add_gc_prefix.c
-	$(CC) -o add_gc_prefix$(EXE_SUFFIX) $(srcdir)/add_gc_prefix.c
-	rm -f add_gc_prefix
-
-gc.tar: $(SRCS) $(OTHER_FILES) add_gc_prefix
-	./add_gc_prefix$(EXE_SUFFIX) $(SRCS) $(OTHER_FILES) > /tmp/gc.tar-files
-	(cd $(srcdir)/.. ; tar cvfh - `cat /tmp/gc.tar-files`) > gc.tar
-
-pc_gc.tar: $(SRCS) $(OTHER_FILES)
-	tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES)
-
-gc.tar.Z: gc.tar
-	compress gc.tar
-
-gc.tar.gz: gc.tar
-	gzip gc.tar
-
-lint: $(CSRCS) tests/test.c
-	lint -DLINT $(CSRCS) tests/test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall"
-
-# BTL: added to test shared library version of collector.
-# Currently works only under SunOS5.  Requires GC_INIT call from statically
-# loaded client code.
-ABSDIR = `pwd`
-gctest_dyn_link: test.o libgc.so
-	$(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link test.o -lgc -ldl -lthread
-
-test_dll.o: tests/test.c libgc_globals.h
-	$(CC) $(CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.o
-
-test_dll: test_dll.o libgc_dll.a libgc.dll
-	$(CC) test_dll.o -L$(ABSDIR) -lgc_dll -o test_dll
-
-SYM_PREFIX-libgc=GC
-
-# Uncomment the following line to build a GNU win32 DLL
-# include Makefile.DLLs
-
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
deleted file mode 100644
index 61054411976..00000000000
--- a/boehm-gc/Makefile.in
+++ /dev/null
@@ -1,779 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = .
-DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/../mkinstalldirs $(srcdir)/threads.mk.in \
-	$(srcdir)/../depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
-	$(top_srcdir)/../config/depstand.m4 \
-	$(top_srcdir)/../config/lead-dot.m4 \
-	$(top_srcdir)/../config/multi.m4 \
-	$(top_srcdir)/../config/no-executables.m4 \
-	$(top_srcdir)/../config/override.m4 \
-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
-	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
-	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-CONFIG_HEADER = $(top_builddir)/include/gc_config.h \
-	$(top_builddir)/include/gc_ext_config.h
-CONFIG_CLEAN_FILES = threads.mk
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@POWERPC_DARWIN_TRUE@am__objects_1 = powerpc_darwin_mach_dep.lo
-am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
-	dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
-	headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \
-	new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \
-	real_malloc.lo reclaim.lo specific.lo stubborn.lo typd_mlc.lo \
-	backgraph.lo win32_threads.lo pthread_support.lo \
-	pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
-libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS)
-am__objects_2 = allchblk.lo alloc.lo blacklst.lo checksums.lo \
-	dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \
-	headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \
-	new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \
-	real_malloc.lo reclaim.lo specific.lo stubborn.lo typd_mlc.lo \
-	backgraph.lo win32_threads.lo pthread_support.lo \
-	pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
-am_libgcjgc_convenience_la_OBJECTS = $(am__objects_2)
-libgcjgc_convenience_la_OBJECTS =  \
-	$(am_libgcjgc_convenience_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-SOURCES = $(libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES)
-MULTISRCTOP = 
-MULTIBUILDTOP = 
-MULTIDIRS = 
-MULTISUBDIR = 
-MULTIDO = true
-MULTICLEAN = true
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
-FGREP = @FGREP@
-GC_CFLAGS = @GC_CFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-O0_CFLAGS = @O0_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-THREADCFLAGS = @THREADCFLAGS@
-THREADLIBS = @THREADLIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-addincludes = @addincludes@
-addlibs = @addlibs@
-addobjs = @addobjs@
-addtests = @addtests@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-extra_ldflags_libgc = @extra_ldflags_libgc@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-mkinstalldirs = @mkinstalldirs@
-multi_basedir = @multi_basedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_all = @target_all@
-target_cpu = @target_cpu@
-target_noncanonical = @target_noncanonical@
-target_os = @target_os@
-target_vendor = @target_vendor@
-toolexecdir = @toolexecdir@
-toolexeclibdir = @toolexeclibdir@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign subdir-objects no-dist
-ACLOCAL_AMFLAGS = -I .. -I ../config
-SUBDIRS = include testsuite
-noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la
-@POWERPC_DARWIN_FALSE@asm_libgcjgc_sources = 
-@POWERPC_DARWIN_TRUE@asm_libgcjgc_sources = powerpc_darwin_mach_dep.s
-libgcjgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
-dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
-malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
-obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
-specific.c stubborn.c typd_mlc.c \
-backgraph.c win32_threads.c \
-pthread_support.c pthread_stop_world.c darwin_stop_world.c \
-$(asm_libgcjgc_sources)
-
-libgcjgc_convenience_la_SOURCES = $(libgcjgc_la_SOURCES)
-EXTRA_DIST = alpha_mach_dep.S \
-mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \
-rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
-sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
-
-
-# Include THREADLIBS here to ensure that the correct versions of
-# linuxthread semaphore functions get linked:
-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
-libgcjgc_la_DEPENDENCIES = $(addobjs)
-libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
-libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)
-libgcjgc_convenience_la_LIBADD = $(addobjs)
-libgcjgc_convenience_la_DEPENDENCIES = $(addobjs)
-AM_CXXFLAGS = $(GC_CFLAGS) $(THREADCFLAGS)
-AM_CFLAGS = $(GC_CFLAGS) $(THREADCFLAGS)
-AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-
-# Work around what appears to be a GNU make bug handling MAKEFLAGS
-# values defined in terms of make variables, as is the case for CC and
-# friends when we are called from the top level Makefile.
-AM_MAKEFLAGS = \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-	"CFLAGS=$(CFLAGS)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"LDFLAGS=$(LDFLAGS)" \
-	"LIBCFLAGS=$(LIBCFLAGS)" \
-	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-	"MAKE=$(MAKE)" \
-	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-	"PICFLAG=$(PICFLAG)" \
-	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-	"SHELL=$(SHELL)" \
-	"EXPECT=$(EXPECT)" \
-	"RUNTEST=$(RUNTEST)" \
-	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-	"exec_prefix=$(exec_prefix)" \
-	"infodir=$(infodir)" \
-	"libdir=$(libdir)" \
-	"prefix=$(prefix)" \
-	"tooldir=$(tooldir)" \
-	"AR=$(AR)" \
-	"AS=$(AS)" \
-	"CC=$(CC)" \
-	"CXX=$(CXX)" \
-	"LD=$(LD)" \
-	"LIBCFLAGS=$(LIBCFLAGS)" \
-	"NM=$(NM)" \
-	"PICFLAG=$(PICFLAG)" \
-	"RANLIB=$(RANLIB)" \
-	"DESTDIR=$(DESTDIR)"
-
-CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
-MAKEOVERRIDES = 
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-threads.mk: $(top_builddir)/config.status $(srcdir)/threads.mk.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgcjgc.la: $(libgcjgc_la_OBJECTS) $(libgcjgc_la_DEPENDENCIES) $(EXTRA_libgcjgc_la_DEPENDENCIES) 
-	$(libgcjgc_la_LINK)  $(libgcjgc_la_OBJECTS) $(libgcjgc_la_LIBADD) $(LIBS)
-libgcjgc_convenience.la: $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_DEPENDENCIES) $(EXTRA_libgcjgc_convenience_la_DEPENDENCIES) 
-	$(LINK)  $(libgcjgc_convenience_la_OBJECTS) $(libgcjgc_convenience_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allchblk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backgraph.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blacklst.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksums.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwin_stop_world.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbg_mlc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dyn_load.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/finalize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc_dlopen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcj_mlc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/headers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mallocx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark_rts.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/new_hblk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obj_map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os_dep.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcr_interface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_stop_world.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_support.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptr_chck.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/real_malloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reclaim.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specific.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stubborn.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typd_mlc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_threads.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-.s.o:
-	$(CCASCOMPILE) -c -o $@ $<
-
-.s.obj:
-	$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# GNU Make needs to see an explicit $(MAKE) variable in the command it
-# runs to enable its job server during parallel builds.  Hence the
-# comments below.
-all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-install-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
-
-mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
-distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
-maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LTLIBRARIES) all-multi
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-multi clean-recursive
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-multi distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am: install-multi
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-multi maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-multi mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all-multi \
-	clean-multi ctags-recursive distclean-multi install-am \
-	install-multi install-strip maintainer-clean-multi \
-	mostlyclean-multi tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-multi am--refresh check check-am clean \
-	clean-generic clean-libtool clean-multi \
-	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-multi distclean-tags dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-multi install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-multi mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS)
-
-.s.lo:
-	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
-.S.lo:
-	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/boehm-gc/NT_MAKEFILE b/boehm-gc/NT_MAKEFILE
deleted file mode 100644
index d1b6a5d6f1f..00000000000
--- a/boehm-gc/NT_MAKEFILE
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for Windows NT.  Assumes Microsoft compiler, and a single thread.
-# DLLs are included in the root set under NT, but not under win32S.
-# Use "nmake nodebug=1 all" for optimized versions of library, gctest and editor.
-
-MY_CPU=X86
-CPU=$(MY_CPU)
-!include <ntwin32.mak>
-
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj
-
-all: gctest.exe cord\de.exe test_cpp.exe
-
-.c.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DSILENT -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_BUILD $*.c /Fo$*.obj
-
-.cpp.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DSILENT -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_BUILD $*.CPP /Fo$*.obj
-
-$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h
-
-gc.lib: $(OBJS)
-	lib /MACHINE:i386 /out:gc.lib $(OBJS)
-# The original NT SDK used lib32 instead of lib
-
-gctest.exe: tests\test.obj gc.lib
-#	The following works for win32 debugging.  For win32s debugging use debugtype:coff
-#	and add mapsympe line.
-#  This produces a "GUI" applications that opens no windows and writes to the log file
-#  "gc.log".  This is done to make the result runnable under win32s.
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:131072 -out:$*.exe tests\test.obj $(guilibs) gc.lib
-#	mapsympe -n -o gctest.sym gctest.exe
-
-cord\de_win.rbj: cord\de_win.res
-	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
-
-cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h
-
-cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h
-	$(rc) $(rcvars) -r -fo cord\de_win.res $(cvars) cord\de_win.rc
-
-# Cord/de is a real win32 gui application.
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe  cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs)
-
-gc_cpp.obj: include\gc_cpp.h include\gc.h
-
-gc_cpp.cpp: gc_cpp.cc
-	copy gc_cpp.cc gc_cpp.cpp
-
-test_cpp.cpp: tests\test_cpp.cc
-	copy tests\test_cpp.cc test_cpp.cpp
-
-# This generates the C++ test executable.  The executable expects
-# a single numeric argument, which is the number of iterations.
-# The output appears in the file "gc.log".
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:test_cpp.exe test_cpp.obj gc.lib $(guilibs)
-
-
-
diff --git a/boehm-gc/NT_STATIC_THREADS_MAKEFILE b/boehm-gc/NT_STATIC_THREADS_MAKEFILE
deleted file mode 100644
index a7582af620b..00000000000
--- a/boehm-gc/NT_STATIC_THREADS_MAKEFILE
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for Windows NT.  Assumes Microsoft compiler.
-# DLLs are included in the root set under NT, but not under win32S.
-# Use "nmake nodebug=1 all" for optimized versions of library, gctest and editor.
-
-MY_CPU=X86
-CPU=$(MY_CPU)
-!include <ntwin32.mak>
-
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj
-
-all: gctest.exe cord\de.exe test_cpp.exe
-
-.c.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DSILENT -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj
-
-.cpp.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DSILENT -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj
-
-$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h
-
-gc.lib: $(OBJS)
-	lib /MACHINE:i386 /out:gc.lib $(OBJS)
-# The original NT SDK used lib32 instead of lib
-
-gctest.exe: tests\test.obj gc.lib
-#	The following works for win32 debugging.  For win32s debugging use debugtype:coff
-#	and add mapsympe line.
-#  This produces a "GUI" applications that opens no windows and writes to the log file
-#  "gc.log".  This is done to make the result runnable under win32s.
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:131072 -out:$*.exe tests\test.obj $(guilibs) gc.lib
-#	mapsympe -n -o gctest.sym gctest.exe
-
-cord\de_win.rbj: cord\de_win.res
-	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
-
-cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h
-
-cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h
-	$(rc) $(rcvars) -r -fo cord\de_win.res $(cvars) cord\de_win.rc
-
-# Cord/de is a real win32 gui application.
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe  cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs)
-
-gc_cpp.obj: include\gc_cpp.h include\gc.h
-
-gc_cpp.cpp: gc_cpp.cc
-	copy gc_cpp.cc gc_cpp.cpp
-
-test_cpp.cpp: tests\test_cpp.cc
-	copy tests\test_cpp.cc test_cpp.cpp
-
-# This generates the C++ test executable.  The executable expects
-# a single numeric argument, which is the number of iterations.
-# The output appears in the file "gc.log".
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:test_cpp.exe test_cpp.obj gc.lib $(guilibs)
-
-
-
diff --git a/boehm-gc/NT_THREADS_MAKEFILE b/boehm-gc/NT_THREADS_MAKEFILE
deleted file mode 100644
index 5f0b5462427..00000000000
--- a/boehm-gc/NT_THREADS_MAKEFILE
+++ /dev/null
@@ -1,2158 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
-# This has been hand-edited way too many times.
-# A clean, manually generated makefile would be an improvement.
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-!IF "$(CFG)" == ""
-CFG=gctest - Win32 Release
-!MESSAGE No configuration specified.  Defaulting to cord - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "gc - Win32 Release" && "$(CFG)" != "gc - Win32 Debug" &&\
- "$(CFG)" != "gctest - Win32 Release" && "$(CFG)" != "gctest - Win32 Debug" &&\
- "$(CFG)" != "cord - Win32 Release" && "$(CFG)" != "cord - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gc.mak" CFG="cord - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gctest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "gctest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "cord - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "cord - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "gctest - Win32 Debug"
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : ".\Release\gc.dll" ".\Release\gc.bsc"
-
-CLEAN : 
-	-@erase ".\Release\allchblk.obj"
-	-@erase ".\Release\allchblk.sbr"
-	-@erase ".\Release\alloc.obj"
-	-@erase ".\Release\alloc.sbr"
-	-@erase ".\Release\blacklst.obj"
-	-@erase ".\Release\blacklst.sbr"
-	-@erase ".\Release\checksums.obj"
-	-@erase ".\Release\checksums.sbr"
-	-@erase ".\Release\dbg_mlc.obj"
-	-@erase ".\Release\dbg_mlc.sbr"
-	-@erase ".\Release\dyn_load.obj"
-	-@erase ".\Release\dyn_load.sbr"
-	-@erase ".\Release\finalize.obj"
-	-@erase ".\Release\finalize.sbr"
-	-@erase ".\Release\gc.bsc"
-	-@erase ".\Release\gc_cpp.obj"
-	-@erase ".\Release\gc_cpp.sbr"
-	-@erase ".\Release\gc.dll"
-	-@erase ".\Release\gc.exp"
-	-@erase ".\Release\gc.lib"
-	-@erase ".\Release\headers.obj"
-	-@erase ".\Release\headers.sbr"
-	-@erase ".\Release\mach_dep.obj"
-	-@erase ".\Release\mach_dep.sbr"
-	-@erase ".\Release\malloc.obj"
-	-@erase ".\Release\malloc.sbr"
-	-@erase ".\Release\mallocx.obj"
-	-@erase ".\Release\mallocx.sbr"
-	-@erase ".\Release\mark.obj"
-	-@erase ".\Release\mark.sbr"
-	-@erase ".\Release\mark_rts.obj"
-	-@erase ".\Release\mark_rts.sbr"
-	-@erase ".\Release\misc.obj"
-	-@erase ".\Release\misc.sbr"
-	-@erase ".\Release\new_hblk.obj"
-	-@erase ".\Release\new_hblk.sbr"
-	-@erase ".\Release\obj_map.obj"
-	-@erase ".\Release\obj_map.sbr"
-	-@erase ".\Release\os_dep.obj"
-	-@erase ".\Release\os_dep.sbr"
-	-@erase ".\Release\ptr_chck.obj"
-	-@erase ".\Release\ptr_chck.sbr"
-	-@erase ".\Release\reclaim.obj"
-	-@erase ".\Release\reclaim.sbr"
-	-@erase ".\Release\stubborn.obj"
-	-@erase ".\Release\stubborn.sbr"
-	-@erase ".\Release\typd_mlc.obj"
-	-@erase ".\Release\typd_mlc.sbr"
-	-@erase ".\Release\win32_threads.obj"
-	-@erase ".\Release\win32_threads.sbr"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "SILENT" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "SILENT" /D "GC_BUILD" /D\
- "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
- "GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\Release/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
-BSC32_SBRS= \
-	".\Release\allchblk.sbr" \
-	".\Release\alloc.sbr" \
-	".\Release\blacklst.sbr" \
-	".\Release\checksums.sbr" \
-	".\Release\dbg_mlc.sbr" \
-	".\Release\dyn_load.sbr" \
-	".\Release\finalize.sbr" \
-	".\Release\gc_cpp.sbr" \
-	".\Release\headers.sbr" \
-	".\Release\mach_dep.sbr" \
-	".\Release\malloc.sbr" \
-	".\Release\mallocx.sbr" \
-	".\Release\mark.sbr" \
-	".\Release\mark_rts.sbr" \
-	".\Release\misc.sbr" \
-	".\Release\new_hblk.sbr" \
-	".\Release\obj_map.sbr" \
-	".\Release\os_dep.sbr" \
-	".\Release\ptr_chck.sbr" \
-	".\Release\reclaim.sbr" \
-	".\Release\stubborn.sbr" \
-	".\Release\typd_mlc.sbr" \
-	".\Release\win32_threads.sbr"
-
-".\Release\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/gc.pdb" /machine:I386 /out:"$(OUTDIR)/gc.dll"\
- /implib:"$(OUTDIR)/gc.lib" 
-LINK32_OBJS= \
-	".\Release\allchblk.obj" \
-	".\Release\alloc.obj" \
-	".\Release\blacklst.obj" \
-	".\Release\checksums.obj" \
-	".\Release\dbg_mlc.obj" \
-	".\Release\dyn_load.obj" \
-	".\Release\finalize.obj" \
-	".\Release\gc_cpp.obj" \
-	".\Release\headers.obj" \
-	".\Release\mach_dep.obj" \
-	".\Release\malloc.obj" \
-	".\Release\mallocx.obj" \
-	".\Release\mark.obj" \
-	".\Release\mark_rts.obj" \
-	".\Release\misc.obj" \
-	".\Release\new_hblk.obj" \
-	".\Release\obj_map.obj" \
-	".\Release\os_dep.obj" \
-	".\Release\ptr_chck.obj" \
-	".\Release\reclaim.obj" \
-	".\Release\stubborn.obj" \
-	".\Release\typd_mlc.obj" \
-	".\Release\win32_threads.obj"
-
-".\Release\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : ".\Debug\gc.dll" ".\Debug\gc.bsc"
-
-CLEAN : 
-	-@erase ".\Debug\allchblk.obj"
-	-@erase ".\Debug\allchblk.sbr"
-	-@erase ".\Debug\alloc.obj"
-	-@erase ".\Debug\alloc.sbr"
-	-@erase ".\Debug\blacklst.obj"
-	-@erase ".\Debug\blacklst.sbr"
-	-@erase ".\Debug\checksums.obj"
-	-@erase ".\Debug\checksums.sbr"
-	-@erase ".\Debug\dbg_mlc.obj"
-	-@erase ".\Debug\dbg_mlc.sbr"
-	-@erase ".\Debug\dyn_load.obj"
-	-@erase ".\Debug\dyn_load.sbr"
-	-@erase ".\Debug\finalize.obj"
-	-@erase ".\Debug\finalize.sbr"
-	-@erase ".\Debug\gc_cpp.obj"
-	-@erase ".\Debug\gc_cpp.sbr"
-	-@erase ".\Debug\gc.bsc"
-	-@erase ".\Debug\gc.dll"
-	-@erase ".\Debug\gc.exp"
-	-@erase ".\Debug\gc.lib"
-	-@erase ".\Debug\gc.map"
-	-@erase ".\Debug\gc.pdb"
-	-@erase ".\Debug\headers.obj"
-	-@erase ".\Debug\headers.sbr"
-	-@erase ".\Debug\mach_dep.obj"
-	-@erase ".\Debug\mach_dep.sbr"
-	-@erase ".\Debug\malloc.obj"
-	-@erase ".\Debug\malloc.sbr"
-	-@erase ".\Debug\mallocx.obj"
-	-@erase ".\Debug\mallocx.sbr"
-	-@erase ".\Debug\mark.obj"
-	-@erase ".\Debug\mark.sbr"
-	-@erase ".\Debug\mark_rts.obj"
-	-@erase ".\Debug\mark_rts.sbr"
-	-@erase ".\Debug\misc.obj"
-	-@erase ".\Debug\misc.sbr"
-	-@erase ".\Debug\new_hblk.obj"
-	-@erase ".\Debug\new_hblk.sbr"
-	-@erase ".\Debug\obj_map.obj"
-	-@erase ".\Debug\obj_map.sbr"
-	-@erase ".\Debug\os_dep.obj"
-	-@erase ".\Debug\os_dep.sbr"
-	-@erase ".\Debug\ptr_chck.obj"
-	-@erase ".\Debug\ptr_chck.sbr"
-	-@erase ".\Debug\reclaim.obj"
-	-@erase ".\Debug\reclaim.sbr"
-	-@erase ".\Debug\stubborn.obj"
-	-@erase ".\Debug\stubborn.sbr"
-	-@erase ".\Debug\typd_mlc.obj"
-	-@erase ".\Debug\typd_mlc.sbr"
-	-@erase ".\Debug\vc40.idb"
-	-@erase ".\Debug\vc40.pdb"
-	-@erase ".\Debug\win32_threads.obj"
-	-@erase ".\Debug\win32_threads.sbr"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "SILENT" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "SILENT" /D "GC_BUILD"\
- /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
- "GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\Debug/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
-BSC32_SBRS= \
-	".\Debug\allchblk.sbr" \
-	".\Debug\alloc.sbr" \
-	".\Debug\blacklst.sbr" \
-	".\Debug\checksums.sbr" \
-	".\Debug\dbg_mlc.sbr" \
-	".\Debug\dyn_load.sbr" \
-	".\Debug\finalize.sbr" \
-	".\Debug\gc_cpp.sbr" \
-	".\Debug\headers.sbr" \
-	".\Debug\mach_dep.sbr" \
-	".\Debug\malloc.sbr" \
-	".\Debug\mallocx.sbr" \
-	".\Debug\mark.sbr" \
-	".\Debug\mark_rts.sbr" \
-	".\Debug\misc.sbr" \
-	".\Debug\new_hblk.sbr" \
-	".\Debug\obj_map.sbr" \
-	".\Debug\os_dep.sbr" \
-	".\Debug\ptr_chck.sbr" \
-	".\Debug\reclaim.sbr" \
-	".\Debug\stubborn.sbr" \
-	".\Debug\typd_mlc.sbr" \
-	".\Debug\win32_threads.sbr"
-
-".\Debug\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/gc.pdb" /map:"$(INTDIR)/gc.map" /debug /machine:I386\
- /out:"$(OUTDIR)/gc.dll" /implib:"$(OUTDIR)/gc.lib" 
-LINK32_OBJS= \
-	".\Debug\allchblk.obj" \
-	".\Debug\alloc.obj" \
-	".\Debug\blacklst.obj" \
-	".\Debug\checksums.obj" \
-	".\Debug\dbg_mlc.obj" \
-	".\Debug\dyn_load.obj" \
-	".\Debug\finalize.obj" \
-	".\Debug\gc_cpp.obj" \
-	".\Debug\headers.obj" \
-	".\Debug\mach_dep.obj" \
-	".\Debug\malloc.obj" \
-	".\Debug\mallocx.obj" \
-	".\Debug\mark.obj" \
-	".\Debug\mark_rts.obj" \
-	".\Debug\misc.obj" \
-	".\Debug\new_hblk.obj" \
-	".\Debug\obj_map.obj" \
-	".\Debug\os_dep.obj" \
-	".\Debug\ptr_chck.obj" \
-	".\Debug\reclaim.obj" \
-	".\Debug\stubborn.obj" \
-	".\Debug\typd_mlc.obj" \
-	".\Debug\win32_threads.obj"
-
-".\Debug\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gctest\Release"
-# PROP BASE Intermediate_Dir "gctest\Release"
-# PROP BASE Target_Dir "gctest"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "gctest\Release"
-# PROP Intermediate_Dir "gctest\Release"
-# PROP Target_Dir "gctest"
-OUTDIR=.\gctest\Release
-INTDIR=.\gctest\Release
-
-ALL : "gc - Win32 Release" ".\Release\gctest.exe"
-
-CLEAN : 
-	-@erase ".\gctest\Release\test.obj"
-	-@erase ".\Release\gctest.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-test.c : tests\test.c
-	copy tests\test.c test.c
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS"\
- /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\gctest\Release/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/gctest.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)/gctest.pdb" /machine:I386 /out:"Release/gctest.exe" 
-LINK32_OBJS= \
-	".\gctest\Release\test.obj" \
-	".\Release\gc.lib"
-
-".\Release\gctest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gctest\Debug"
-# PROP BASE Intermediate_Dir "gctest\Debug"
-# PROP BASE Target_Dir "gctest"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "gctest\Debug"
-# PROP Intermediate_Dir "gctest\Debug"
-# PROP Target_Dir "gctest"
-OUTDIR=.\gctest\Debug
-INTDIR=.\gctest\Debug
-
-ALL : "gc - Win32 Debug" ".\Debug\gctest.exe" ".\gctest\Debug\gctest.bsc"
-
-CLEAN : 
-	-@erase ".\Debug\gctest.exe"
-	-@erase ".\gctest\Debug\gctest.bsc"
-	-@erase ".\gctest\Debug\gctest.map"
-	-@erase ".\gctest\Debug\gctest.pdb"
-	-@erase ".\gctest\Debug\test.obj"
-	-@erase ".\gctest\Debug\test.sbr"
-	-@erase ".\gctest\Debug\vc40.idb"
-	-@erase ".\gctest\Debug\vc40.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
- /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR"$(INTDIR)/"\
- /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\gctest\Debug/
-CPP_SBRS=.\gctest\Debug/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
-BSC32_SBRS= \
-	".\gctest\Debug\test.sbr"
-
-".\gctest\Debug\gctest.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"Debug/gctest.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)/gctest.pdb" /map:"$(INTDIR)/gctest.map" /debug /machine:I386\
- /out:"Debug/gctest.exe" 
-LINK32_OBJS= \
-	".\Debug\gc.lib" \
-	".\gctest\Debug\test.obj"
-
-".\Debug\gctest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cord\Release"
-# PROP BASE Intermediate_Dir "cord\Release"
-# PROP BASE Target_Dir "cord"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "cord\Release"
-# PROP Intermediate_Dir "cord\Release"
-# PROP Target_Dir "cord"
-OUTDIR=.\cord\Release
-INTDIR=.\cord\Release
-
-ALL : "gc - Win32 Release" ".\Release\de.exe"
-
-CLEAN : 
-	-@erase ".\cord\Release\cordbscs.obj"
-	-@erase ".\cord\Release\cordxtra.obj"
-	-@erase ".\cord\Release\de.obj"
-	-@erase ".\cord\Release\de_win.obj"
-	-@erase ".\cord\Release\de_win.res"
-	-@erase ".\Release\de.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\cord\Release/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/de.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)/de.pdb"\
- /machine:I386 /out:"Release/de.exe" 
-LINK32_OBJS= \
-	".\cord\Release\cordbscs.obj" \
-	".\cord\Release\cordxtra.obj" \
-	".\cord\Release\de.obj" \
-	".\cord\Release\de_win.obj" \
-	".\cord\Release\de_win.res" \
-	".\Release\gc.lib"
-
-".\Release\de.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cord\Debug"
-# PROP BASE Intermediate_Dir "cord\Debug"
-# PROP BASE Target_Dir "cord"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "cord\Debug"
-# PROP Intermediate_Dir "cord\Debug"
-# PROP Target_Dir "cord"
-OUTDIR=.\cord\Debug
-INTDIR=.\cord\Debug
-
-ALL : "gc - Win32 Debug" ".\Debug\de.exe"
-
-CLEAN : 
-	-@erase ".\cord\Debug\cordbscs.obj"
-	-@erase ".\cord\Debug\cordxtra.obj"
-	-@erase ".\cord\Debug\de.obj"
-	-@erase ".\cord\Debug\de.pdb"
-	-@erase ".\cord\Debug\de_win.obj"
-	-@erase ".\cord\Debug\de_win.res"
-	-@erase ".\cord\Debug\vc40.idb"
-	-@erase ".\cord\Debug\vc40.pdb"
-	-@erase ".\Debug\de.exe"
-	-@erase ".\Debug\de.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I include /D "_DEBUG" /D "WIN32" /D\
- "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX\
- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\cord\Debug/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/de.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:yes\
- /pdb:"$(OUTDIR)/de.pdb" /debug /machine:I386 /out:"Debug/de.exe" 
-LINK32_OBJS= \
-	".\cord\Debug\cordbscs.obj" \
-	".\cord\Debug\cordxtra.obj" \
-	".\cord\Debug\de.obj" \
-	".\cord\Debug\de_win.obj" \
-	".\cord\Debug\de_win.res" \
-	".\Debug\gc.lib"
-
-".\Debug\de.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-################################################################################
-# Begin Target
-
-# Name "gc - Win32 Release"
-# Name "gc - Win32 Debug"
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\gc_cpp.cpp
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_cpp.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Release\gc_cpp.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_cpp.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Debug\gc_cpp.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\reclaim.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Release\reclaim.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Debug\reclaim.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\os_dep.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_OS_DE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OS_DE=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	".\vd\PCR_VD.h"\
-	
-
-".\Release\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-".\Release\os_dep.sbr" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_OS_DE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OS_DE=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	".\vd\PCR_VD.h"\
-	
-
-".\Debug\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-".\Debug\os_dep.sbr" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\misc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MISC_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MISC_=\
-	".\il\PCR_IL.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-".\Release\misc.sbr" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MISC_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MISC_=\
-	".\il\PCR_IL.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-".\Debug\misc.sbr" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mark_rts.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MARK_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-".\Release\mark_rts.sbr" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MARK_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-".\Debug\mark_rts.sbr" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mach_dep.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MACH_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MACH_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-".\Release\mach_dep.sbr" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MACH_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MACH_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-".\Debug\mach_dep.sbr" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\headers.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_HEADE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_HEADE=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-".\Release\headers.sbr" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_HEADE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_HEADE=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-".\Debug\headers.sbr" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\alloc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_ALLOC=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLOC=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-".\Release\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_ALLOC=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLOC=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-".\Debug\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\allchblk.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_ALLCH=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLCH=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-".\Release\allchblk.sbr" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_ALLCH=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLCH=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-".\Debug\allchblk.sbr" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\stubborn.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_STUBB=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_STUBB=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Release\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_STUBB=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_STUBB=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Debug\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\obj_map.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_OBJ_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OBJ_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-".\Release\obj_map.sbr" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_OBJ_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OBJ_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-".\Debug\obj_map.sbr" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\new_hblk.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_NEW_H=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_NEW_H=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-".\Release\new_hblk.sbr" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_NEW_H=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_NEW_H=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-".\Debug\new_hblk.sbr" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mark.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MARK_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-".\Release\mark.sbr" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MARK_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-".\Debug\mark.sbr" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\malloc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MALLO=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLO=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-".\Release\malloc.sbr" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MALLO=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLO=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-".\Debug\malloc.sbr" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mallocx.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MALLX=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLX=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-".\Release\mallocx.sbr" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MALLX=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLX=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-".\Debug\mallocx.sbr" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\finalize.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_FINAL=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_FINAL=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-".\Release\finalize.sbr" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_FINAL=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_FINAL=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-".\Debug\finalize.sbr" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\dbg_mlc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_DBG_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DBG_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-".\Release\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_DBG_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DBG_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-".\Debug\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\blacklst.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_BLACK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_BLACK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-".\Release\blacklst.sbr" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_BLACK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_BLACK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-".\Debug\blacklst.sbr" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\typd_mlc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_TYPD_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TYPD_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-".\Release\typd_mlc.sbr" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_TYPD_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TYPD_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-".\Debug\typd_mlc.sbr" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\ptr_chck.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_PTR_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_PTR_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-".\Release\ptr_chck.sbr" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_PTR_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_PTR_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-".\Debug\ptr_chck.sbr" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\dyn_load.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_DYN_L=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DYN_L=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-".\Release\dyn_load.sbr" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_DYN_L=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DYN_L=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-".\Debug\dyn_load.sbr" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\win32_threads.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_WIN32=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_WIN32=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-".\Release\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_WIN32=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_WIN32=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-".\Debug\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\checksums.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_CHECK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_CHECK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-".\Release\checksums.sbr" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_CHECK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_CHECK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-".\Debug\checksums.sbr" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "gctest - Win32 Release"
-# Name "gctest - Win32 Debug"
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Project Dependency
-
-# Project_Dep_Name "gc"
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
-
-!ENDIF 
-
-# End Project Dependency
-################################################################################
-# Begin Source File
-
-SOURCE=.\tests\test.c
-DEP_CPP_TEST_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TEST_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-
-".\gctest\Release\test.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-
-".\gctest\Debug\test.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-".\gctest\Debug\test.sbr" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "cord - Win32 Release"
-# Name "cord - Win32 Debug"
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Project Dependency
-
-# Project_Dep_Name "gc"
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
-
-!ENDIF 
-
-# End Project Dependency
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de_win.c
-DEP_CPP_DE_WI=\
-	".\include\cord.h"\
-	".\cord\de_cmds.h"\
-	".\cord\de_win.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_DE_WI=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de_win.obj" : $(SOURCE) $(DEP_CPP_DE_WI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de_win.obj" : $(SOURCE) $(DEP_CPP_DE_WI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de.c
-DEP_CPP_DE_C2e=\
-	".\include\cord.h"\
-	".\cord\de_cmds.h"\
-	".\cord\de_win.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_DE_C2e=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de.obj" : $(SOURCE) $(DEP_CPP_DE_C2e) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de.obj" : $(SOURCE) $(DEP_CPP_DE_C2e) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\cordxtra.c
-DEP_CPP_CORDX=\
-	".\include\cord.h"\
-	".\include\ec.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_CORDX=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\cordxtra.obj" : $(SOURCE) $(DEP_CPP_CORDX) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\cordxtra.obj" : $(SOURCE) $(DEP_CPP_CORDX) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\cordbscs.c
-DEP_CPP_CORDB=\
-	".\include\cord.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_CORDB=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\cordbscs.obj" : $(SOURCE) $(DEP_CPP_CORDB) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\cordbscs.obj" : $(SOURCE) $(DEP_CPP_CORDB) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de_win.RC
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de_win.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)/de_win.res" /i "cord" /d "NDEBUG" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de_win.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)/de_win.res" /i "cord" /d "_DEBUG" $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/boehm-gc/OS2_MAKEFILE b/boehm-gc/OS2_MAKEFILE
deleted file mode 100644
index 690598d69d4..00000000000
--- a/boehm-gc/OS2_MAKEFILE
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile for OS/2.  Assumes IBM's compiler, static linking, and a single thread.
-# Adding dynamic linking support seems easy, but takes a little bit of work.
-# Adding thread support may be nontrivial, since we haven't yet figured out how to
-# look at another thread's registers.
-
-# Significantly revised for GC version 4.4 by Mark Boulter (Jan 1994).
-
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
-
-CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj
-
-CC= icc
-CFLAGS= /O /Q /DSILENT /DSMALL_CONFIG /DALL_INTERIOR_POINTERS
-# Use /Ti instead of /O for debugging
-# Setjmp_test may yield overly optimistic results when compiled
-# without optimization.
-
-all: $(OBJS) gctest.exe cord\cordtest.exe
-
-$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h
-
-## ERASE THE LIB FIRST - if it is already there then this command will fail
-## (make sure its there or erase will fail!)
-gc.lib: $(OBJS)
-        echo . > gc.lib
-        erase gc.lib
-        LIB gc.lib $(OBJS), gc.lst
-
-mach_dep.obj: mach_dep.c
-        $(CC) $(CFLAGS) /C mach_dep.c
-
-gctest.exe: test.obj gc.lib
-        $(CC) $(CFLAGS) /B"/STACK:524288" /Fegctest test.obj gc.lib
-
-cord\cordbscs.obj: cord\cordbscs.c include\cord.h include\private\cord_pos.h
-        $(CC) $(CFLAGS) /C /Focord\cordbscs cord\cordbscs.c
-
-cord\cordxtra.obj: cord\cordxtra.c include\cord.h include\private\cord_pos.h include\ec.h
-        $(CC) $(CFLAGS) /C /Focord\cordxtra cord\cordxtra.c
-
-cord\cordprnt.obj: cord\cordprnt.c include\cord.h include\private\cord_pos.h include\ec.h
-        $(CC) $(CFLAGS) /C /Focord\cordprnt cord\cordprnt.c
-
-cord\cordtest.exe: cord\cordtest.c include\cord.h include\private\cord_pos.h include\ec.h $(CORDOBJS) gc.lib
-        $(CC) $(CFLAGS) /B"/STACK:65536" /Fecord\cordtest cord\cordtest.c gc.lib $(CORDOBJS)
diff --git a/boehm-gc/PCR-Makefile b/boehm-gc/PCR-Makefile
deleted file mode 100644
index 1eae3672556..00000000000
--- a/boehm-gc/PCR-Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Default target
-#
-
-default: gc.o
-
-include ../config/common.mk
-
-#
-# compilation flags, etc.
-#
-
-
-CPPFLAGS = $(INCLUDE) $(CONFIG_CPPFLAGS) \
-	-DPCR_NO_RENAME -DPCR_NO_HOSTDEP_ERR
-#CFLAGS	= -DPCR -DSILENT $(CONFIG_CFLAGS)
-CFLAGS	= -DPCR $(CONFIG_CFLAGS)
-SPECIALCFLAGS = 	# For code involving asm's
-
-ASPPFLAGS  = $(INCLUDE) $(CONFIG_ASPPFLAGS) \
-	-DPCR_NO_RENAME -DPCR_NO_HOSTDEP_ERR -DASM
-
-ASFLAGS	= $(CONFIG_ASFLAGS)
-
-LDRFLAGS = $(CONFIG_LDRFLAGS)
-
-LDFLAGS = $(CONFIG_LDFLAGS)
-
-#
-#
-#
-#
-# BEGIN PACKAGE-SPECIFIC PART
-#
-#
-#
-#
-
-# Fix to point to local pcr installation directory.
-PCRDIR= ..
-
-COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o pcr_interface.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o
-
-CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c
-
-SHELL= /bin/sh
-
-default: gc.o
-
-gc.o: $(COBJ) mach_dep.o
-	$(LDR) $(CONFIG_LDRFLAGS) -o gc.o $(COBJ) mach_dep.o
-
-
-mach_dep.o: mach_dep.c mips_mach_dep.s rs6000_mach_dep.s if_mach if_not_there
-	rm -f mach_dep.o
-	./if_mach MIPS "" as -o mach_dep.o mips_mach_dep.s
-	./if_mach RS6000 "" as -o mach_dep.o rs6000_mach_dep.s
-	./if_mach ALPHA "" as -o mach_dep.o alpha_mach_dep.s
-	./if_mach SPARC SUNOS5 as -o mach_dep.o sparc_mach_dep.s
-	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) mach_dep.c
-
-if_mach: if_mach.c gcconfig.h
-	$(CC) $(CFLAGS) -o if_mach if_mach.c
-
-if_not_there: if_not_there.c
-	$(CC) $(CFLAGS) -o if_not_there if_not_there.c
-
-
diff --git a/boehm-gc/SMakefile.amiga b/boehm-gc/SMakefile.amiga
deleted file mode 100644
index e2085051bbc..00000000000
--- a/boehm-gc/SMakefile.amiga
+++ /dev/null
@@ -1,178 +0,0 @@
-
-# Rewritten smakefile for amiga / sas/c. -Kjetil M.
-# Dont use the cord-package if you define parm=both or parm=reg.
-
-
-#----------------TOOLS--------------------------------
-CC=sc
-LINKER=slink
-LIBER=oml
-
-#----------------CPU OPTIONS--------------------------
-
-CPU=68060
-
-#----------------FPU OPTIONS--------------------------
-
-MATH=8
-MATHLIB=LIB:scm881.lib
-
-#----------------COMPILER OPTIONS---------------------
-
-IGNORE= IGNORE=85 IGNORE=154 IGNORE=161 IGNORE=100 
-
-OPTIMIZE=optimize optimizetime optglobal optimizerdepth=100 optimizerpeephole optloop OPTSCHED optimizerinlocal optimizerrecurdepth=100
-# optimizerinline optimizercomplexity=100
-
-OPT= $(OPTIMIZE) CPU=$(CPU) math=$(MATH) NOSTACKCHECK VERBOSE \
-MAPHUNK NOVERSION NOICONS nodebug \
-DEFINE SILENT \
-parm=reg \
-DEFINE __USE_SYSBASE
-
-
-SOPT= $(OPT) $(IGNORE) \
-DEFINE AMIGA_SKIP_SEG \
-DEFINE ATOMIC_UNCOLLECTABLE \
-DEFINE GC_AMIGA_FASTALLOC \
-DEFINE GC_AMIGA_RETRY \
-DEFINE GC_AMIGA_PRINTSTATS \
-DEFINE GC_AMIGA_GC
-
-
-#DEFINE ALL_INTERIOR_POINTERS \
-
-
-SCOPT= $(SOPT) define GC_AMIGA_MAKINGLIB
-
-CSCOPT= $(OPT) DEFINE AMIGA IGNORE=100 IGNORE=161 
-
-#------------------LINKING----------------------------
-
-
-all: gctest setjmp_t cord/cordtest
-
-clean:
-   delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/*.lib cord/*.lnk cord/cordtest
-	smake
-
-test: setjmp_t gctest cord/cordtest
-   setjmp_t
-   gctest
-   cord/cordtest
-
-gctest: gc$(CPU).lib GCAmigaOS$(CPU).lib test.o
-   $(LINKER) LIB:c.o test.o TO gctest LIB gc$(CPU).lib LIB:sc.lib $(MATHLIB)
-
-setjmp_t: setjmp_t.o gc.h
-   $(LINKER) LIB:c.o setjmp_t.o to setjmp_t lib LIB:sc.lib
-
-cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
-	slink LIB:c.o cord/cordtest.o LIB $(MATHLIB) gc$(CPU).lib cord/cord$(CPU).lib LIB:sc.lib TO cord/cordtest
-
-
-#------------------LIBBING----------------------------
-
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
-
-gc$(CPU).lib: $(OBJS)
-   $(LIBER) gc$(CPU).lib r $(OBJS)
-
-
-COBJS = cord/cordbscs.o cord/cordprnt.o cord/cordxtra.o
-
-cord/cord$(CPU).lib: $(COBJS)
-	oml cord/cord$(CPU).lib r $(COBJS)
-
-#------------------COMPILING--------------------------
-
-INC=  gc_private.h gc_hdrs.h gc.h gcconfig.h
-
-alloc.o : alloc.c $(INC)
-	$(CC) alloc.c $(SCOPT) ignore=7
-
-reclaim.o : reclaim.c $(INC)
-	$(CC) reclaim.c $(SCOPT)
-
-allchblk.o : allchblk.c $(INC)
-	$(CC) allchblk.c $(SCOPT)
-
-misc.o : misc.c $(INC)
-	$(CC) misc.c $(SCOPT)
-
-os_dep.o : os_dep.c $(INC) AmigaOS.c
-	$(CC) os_dep.c $(SCOPT)
-
-mark_rts.o : mark_rts.c $(INC)
-	$(CC) mark_rts.c $(SCOPT)
-
-headers.o : headers.c $(INC)
-	$(CC) headers.c $(SCOPT)
-
-mark.o : mark.c $(INC)
-	$(CC) mark.c $(SCOPT)
-
-obj_map.o : obj_map.c $(INC)
-	$(CC) obj_map.c $(SCOPT)
-
-blacklst.o : blacklst.c $(INC)
-	$(CC) blacklst.c $(SCOPT)
-
-finalize.o : finalize.c $(INC)
-	$(CC) finalize.c $(SCOPT) noopt	#Could sas/c still have problems with this one? Gctest sometimes fails to finalize all.
-
-new_hblk.o : new_hblk.c $(INC)
-	$(CC) new_hblk.c $(SCOPT)
-
-real_malloc.o : real_malloc.c $(INC)
-	$(CC) real_malloc.c $(SCOPT)
-
-dyn_load.o : dyn_load.c $(INC)
-	$(CC) dyn_load.c $(SCOPT)
-
-dbg_mlc.o : dbg_mlc.c $(INC)
-	$(CC) dbg_mlc.c $(SCOPT)
-
-malloc.o : malloc.c $(INC)
-	$(CC) malloc.c $(SCOPT)
-
-mallocx.o : mallocx.c $(INC)
-	$(CC) mallocx.c $(SCOPT)
-
-stubborn.o : stubborn.c $(INC)
-	$(CC) stubborn.c $(SCOPT)
-
-checksums.o : checksums.c $(INC)
-	$(CC) checksums.c $(SCOPT)
-
-typd_mlc.o: typd_mlc.c $(INC)
-	$(CC) typd_mlc.c $(SCOPT)
-
-mach_dep.o : mach_dep.c $(INC)
-	$(CC) mach_dep.c $(SCOPT)
-
-ptr_chck.o: ptr_chck.c $(INC)
-	$(CC) ptr_chck.c $(SCOPT)
-
-test.o : test.c $(INC)
-	$(CC) test.c $(SOPT)
-
-setjmp_t: setjmp_t.c gc.h
-   $(CC) setjmp_t.c $(SOPT)
-
-
-# cords:
-
-cord/cordbscs.o: cord/cordbscs.c
-	sc cord/cordbscs.c $(CSCOPT)
-
-cord/cordprnt.o: cord/cordprnt.c
-	sc cord/cordprnt.c $(CSCOPT)
-
-cord/cordxtra.o: cord/cordxtra.c
-	sc cord/cordxtra.c $(CSCOPT)
-
-cord/cordtest.o: cord/cordtest.c
-	sc cord/cordtest.c $(CSCOPT)
-
-
diff --git a/boehm-gc/WCC_MAKEFILE b/boehm-gc/WCC_MAKEFILE
deleted file mode 100644
index 32b01df1754..00000000000
--- a/boehm-gc/WCC_MAKEFILE
+++ /dev/null
@@ -1,196 +0,0 @@
-# Makefile for Watcom C/C++ 10.5, 10.6, 11.0 on NT, OS2 and DOS4GW.
-# May work with Watcom 10.0.
-
-# Uncoment one of the lines below for cross compilation.
-SYSTEM=MSWIN32
-#SYSTEM=DOS4GW
-#SYSTEM=OS2
-
-# The collector can be built either as dynamic or as static library.
-# Select the library type you need.
-#MAKE_AS_DLL=1
-MAKE_AS_LIB=1
-
-# Select calling conventions.
-# Possible choices are r and s.
-CALLING=s
-
-# Select target CPU.
-# Possible choices are 3, 4, 5, and 6.
-# The last choice available only since version 11.0.
-CPU=5
-
-# Set optimization options.
-# Watcom before 11.0 does not support option "-oh".
-OPTIM=-oneatx -s
-#OPTIM=-ohneatx -s
-
-DEFS=-DALL_INTERIOR_POINTERS -DSILENT -DNO_SIGNALS #-DSMALL_CONFIG #-DGC_DEBUG
-
-
-#####
-
-!ifndef SYSTEM
-!ifdef __MSDOS__
-SYSTEM=DOS4GW
-!else ifdef __NT__
-SYSTEM=MSWIN32
-!else ifdef __OS2__
-SYSTEM=OS2
-!else
-SYSTEM=Unknown
-!endif
-!endif
-
-!define $(SYSTEM)
-
-!ifdef DOS4GW
-SYSFLAG=-DDOS4GW -bt=dos
-!else ifdef MSWIN32
-SYSFLAG=-DMSWIN32 -bt=nt
-!else ifdef OS2
-SYSFLAG=-DOS2 -bt=os2
-!else
-!error undefined or unsupported target platform: $(SYSTEM)
-!endif
-!ifdef MAKE_AS_DLL
-DLLFLAG=-bd -DGC_DLL
-TEST_DLLFLAG=-DGC_DLL
-!else ifdef MAKE_AS_LIB
-DLLFLAG=
-TEST_DLLFLAG=
-!else
-!error Either MAKE_AS_LIB or MAKE_AS_DLL should be defined
-!endif
-
-CC=wcc386
-CXX=wpp386
-
-# -DUSE_GENERIC is required !
-CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) -DGC_BUILD -DUSE_GENERIC $(DEFS)
-CXXFLAGS= $(CFLAGS)
-TEST_CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(TEST_DLLFLAG) $(DEFS)
-TEST_CXXFLAGS= $(TEST_CFLAGS)
-
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj &
-      mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj &
-      obj_map.obj blacklst.obj finalize.obj new_hblk.obj &
-      dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj &
-      typd_mlc.obj ptr_chck.obj mallocx.obj
-
-all: gc.lib gctest.exe test_cpp.exe
-
-!ifdef MAKE_AS_DLL
-
-gc.lib: gc.dll gc_cpp.obj
-        *wlib -b -c -n -p=512 $@ +gc.dll +gc_cpp.obj
-
-gc.dll: $(OBJS) .AUTODEPEND
-        @%create $*.lnk
-!ifdef DOS4GW
-        @%append $*.lnk sys os2v2_dll
-!else ifdef MSWIN32
-        @%append $*.lnk sys nt_dll
-!else ifdef OS2
-        @%append $*.lnk sys os2v2_dll
-!endif
-        @%append $*.lnk name $*
-        @for %i in ($(OBJS)) do @%append $*.lnk file '%i'
-!ifeq CALLING s
-      @%append $*.lnk export GC_is_marked
-      @%append $*.lnk export GC_incr_words_allocd
-      @%append $*.lnk export GC_incr_mem_freed
-      @%append $*.lnk export GC_generic_malloc_words_small
-!else
-      @%append $*.lnk export GC_is_marked_
-      @%append $*.lnk export GC_incr_words_allocd_
-      @%append $*.lnk export GC_incr_mem_freed_
-      @%append $*.lnk export GC_generic_malloc_words_small_
-!endif
-        *wlink @$*.lnk
-!else
-gc.lib: $(OBJS) gc_cpp.obj
-        @%create $*.lb1
-        @for %i in ($(OBJS)) do @%append $*.lb1 +'%i'
-      @%append $*.lb1 +'gc_cpp.obj'
-        *wlib -b -c -n -p=512 $@ @$*.lb1
-
-!endif
-
-
-gctest.exe: test.obj gc.lib
-        %create $*.lnk
-!ifdef DOS4GW
-        @%append $*.lnk sys dos4g
-!else ifdef MSWIN32
-        @%append $*.lnk sys nt
-!else ifdef OS2
-        @%append $*.lnk sys os2v2
-!endif
-        @%append $*.lnk op case
-        @%append $*.lnk op stack=256K
-        @%append $*.lnk name $*
-        @%append $*.lnk file test.obj
-        @%append $*.lnk library gc.lib
-!ifdef MAKE_AS_DLL
-!ifeq CALLING s
-      @%append $*.lnk import GC_is_marked gc
-!else
-      @%append $*.lnk import GC_is_marked_ gc
-!endif
-!endif
-        *wlink @$*.lnk
-test_cpp.exe: test_cpp.obj gc.lib
-        %create $*.lnk
-!ifdef DOS4GW
-        @%append $*.lnk sys dos4g
-!else ifdef MSWIN32
-        @%append $*.lnk sys nt
-!else ifdef OS2
-        @%append $*.lnk sys os2v2
-!endif
-        @%append $*.lnk op case
-        @%append $*.lnk op stack=256K
-        @%append $*.lnk name $*
-        @%append $*.lnk file test_cpp.obj
-        @%append $*.lnk library gc.lib
-!ifdef MAKE_AS_DLL
-!ifeq CALLING s
-      @%append $*.lnk import GC_incr_words_allocd gc
-      @%append $*.lnk import GC_incr_mem_freed gc
-      @%append $*.lnk import GC_generic_malloc_words_small gc
-!else
-      @%append $*.lnk import GC_incr_words_allocd_ gc
-      @%append $*.lnk import GC_incr_mem_freed_ gc
-      @%append $*.lnk import GC_generic_malloc_words_small_ gc
-!endif
-!endif
-        *wlink @$*.lnk
-
-gc_cpp.obj: gc_cpp.cc .AUTODEPEND
-        $(CXX) $(TEST_CXXFLAGS) -iinclude $*.cc
-test.obj: tests\test.c .AUTODEPEND
-        $(CC) $(TEST_CFLAGS) $*.c
-test_cpp.obj: tests\test_cpp.cc .AUTODEPEND
-        $(CXX) $(TEST_CXXFLAGS) -iinclude $*.cc
-
-
-.c.obj: .AUTODEPEND
-        $(CC) $(CFLAGS) $*.c
-
-.cc.obj: .AUTODEPEND
-        $(CXX) $(CXXFLAGS) $*.cc
-
-clean : .SYMBOLIC
-    @if exist *.obj del *.obj
-    @if exist *.map del *.map
-    @if exist *.lnk del *.lnk
-    @if exist *.lb1 del *.lb1
-    @if exist *.sym del *.sym
-    @if exist *.err del *.err
-    @if exist *.tmp del *.tmp
-    @if exist *.lst del *.lst
-    @if exist *.exe del *.exe
-    @if exist *.log del *.log
-    @if exist *.lib del *.lib
-    @if exist *.dll del *.dll
diff --git a/boehm-gc/aclocal.m4 b/boehm-gc/aclocal.m4
deleted file mode 100644
index da7badc9fb8..00000000000
--- a/boehm-gc/aclocal.m4
+++ /dev/null
@@ -1,1036 +0,0 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([../config/acx.m4])
-m4_include([../config/depstand.m4])
-m4_include([../config/lead-dot.m4])
-m4_include([../config/multi.m4])
-m4_include([../config/no-executables.m4])
-m4_include([../config/override.m4])
-m4_include([../libtool.m4])
-m4_include([../ltoptions.m4])
-m4_include([../ltsugar.m4])
-m4_include([../ltversion.m4])
-m4_include([../lt~obsolete.m4])
diff --git a/boehm-gc/add_gc_prefix.c b/boehm-gc/add_gc_prefix.c
deleted file mode 100644
index 59515c7866e..00000000000
--- a/boehm-gc/add_gc_prefix.c
+++ /dev/null
@@ -1,20 +0,0 @@
-# include <stdio.h>
-# include "version.h"
- 
-int main(argc, argv, envp)
-int argc;
-char ** argv;
-char ** envp;
-{
-    int i;
-    
-    for (i = 1; i < argc; i++) {
-      if (GC_ALPHA_VERSION == GC_NOT_ALPHA) {
-	printf("gc%d.%d/%s ", GC_VERSION_MAJOR, GC_VERSION_MINOR, argv[i]);
-      } else {
-	printf("gc%d.%dalpha%d/%s ", GC_VERSION_MAJOR,
-	       GC_VERSION_MINOR, GC_ALPHA_VERSION, argv[i]);
-      }
-    }
-    return(0);
-}
diff --git a/boehm-gc/allchblk.c b/boehm-gc/allchblk.c
deleted file mode 100644
index 1a1efc6b91b..00000000000
--- a/boehm-gc/allchblk.c
+++ /dev/null
@@ -1,838 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1998-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/* #define DEBUG */
-#include <stdio.h>
-#include "private/gc_priv.h"
-
-GC_bool GC_use_entire_heap = 0;
-
-/*
- * Free heap blocks are kept on one of several free lists,
- * depending on the size of the block.  Each free list is doubly linked.
- * Adjacent free blocks are coalesced.
- */
-
- 
-# define MAX_BLACK_LIST_ALLOC (2*HBLKSIZE)
-		/* largest block we will allocate starting on a black   */
-		/* listed block.  Must be >= HBLKSIZE.			*/
-
-
-# define UNIQUE_THRESHOLD 32
-	/* Sizes up to this many HBLKs each have their own free list    */
-# define HUGE_THRESHOLD 256
-	/* Sizes of at least this many heap blocks are mapped to a	*/
-	/* single free list.						*/
-# define FL_COMPRESSION 8
-	/* In between sizes map this many distinct sizes to a single	*/
-	/* bin.								*/
-
-# define N_HBLK_FLS (HUGE_THRESHOLD - UNIQUE_THRESHOLD)/FL_COMPRESSION \
-				 + UNIQUE_THRESHOLD
-
-struct hblk * GC_hblkfreelist[N_HBLK_FLS+1] = { 0 };
-
-#ifndef USE_MUNMAP
-
-  word GC_free_bytes[N_HBLK_FLS+1] = { 0 };
-	/* Number of free bytes on each list.	*/
-
-  /* Is bytes + the number of free bytes on lists n .. N_HBLK_FLS 	*/
-  /* > GC_max_large_allocd_bytes?					*/
-# ifdef __GNUC__
-  __inline__
-# endif
-  static GC_bool GC_enough_large_bytes_left(bytes,n)
-  word bytes;
-  int n;
-  {
-    int i;
-    for (i = N_HBLK_FLS; i >= n; --i) {
-	bytes += GC_free_bytes[i];
-	if (bytes > GC_max_large_allocd_bytes) return TRUE;
-    }
-    return FALSE;
-  }
-
-# define INCR_FREE_BYTES(n, b) GC_free_bytes[n] += (b);
-
-# define FREE_ASSERT(e) GC_ASSERT(e)
-
-#else /* USE_MUNMAP */
-
-# define INCR_FREE_BYTES(n, b)
-# define FREE_ASSERT(e)
-
-#endif /* USE_MUNMAP */
-
-/* Map a number of blocks to the appropriate large block free list index. */
-int GC_hblk_fl_from_blocks(blocks_needed)
-word blocks_needed;
-{
-    if (blocks_needed <= UNIQUE_THRESHOLD) return blocks_needed;
-    if (blocks_needed >= HUGE_THRESHOLD) return N_HBLK_FLS;
-    return (blocks_needed - UNIQUE_THRESHOLD)/FL_COMPRESSION
-					+ UNIQUE_THRESHOLD;
-    
-}
-
-# define PHDR(hhdr) HDR(hhdr -> hb_prev)
-# define NHDR(hhdr) HDR(hhdr -> hb_next)
-
-# ifdef USE_MUNMAP
-#   define IS_MAPPED(hhdr) (((hhdr) -> hb_flags & WAS_UNMAPPED) == 0)
-# else  /* !USE_MMAP */
-#   define IS_MAPPED(hhdr) 1
-# endif /* USE_MUNMAP */
-
-# if !defined(NO_DEBUGGING)
-void GC_print_hblkfreelist()
-{
-    struct hblk * h;
-    word total_free = 0;
-    hdr * hhdr;
-    word sz;
-    int i;
-    
-    for (i = 0; i <= N_HBLK_FLS; ++i) {
-      h = GC_hblkfreelist[i];
-#     ifdef USE_MUNMAP
-        if (0 != h) GC_printf1("Free list %ld:\n",
-		               (unsigned long)i);
-#     else
-        if (0 != h) GC_printf2("Free list %ld (Total size %ld):\n",
-		               (unsigned long)i,
-			       (unsigned long)GC_free_bytes[i]);
-#     endif
-      while (h != 0) {
-        hhdr = HDR(h);
-        sz = hhdr -> hb_sz;
-    	GC_printf2("\t0x%lx size %lu ", (unsigned long)h, (unsigned long)sz);
-    	total_free += sz;
-        if (GC_is_black_listed(h, HBLKSIZE) != 0) {
-             GC_printf0("start black listed\n");
-        } else if (GC_is_black_listed(h, hhdr -> hb_sz) != 0) {
-             GC_printf0("partially black listed\n");
-        } else {
-             GC_printf0("not black listed\n");
-        }
-        h = hhdr -> hb_next;
-      }
-    }
-#   ifndef USE_MUNMAP
-      if (total_free != GC_large_free_bytes) {
-	GC_printf1("GC_large_free_bytes = %lu (INCONSISTENT!!)\n",
-		   (unsigned long) GC_large_free_bytes);
-      }
-#   endif
-    GC_printf1("Total of %lu bytes on free list\n", (unsigned long)total_free);
-}
-
-/* Return the free list index on which the block described by the header */
-/* appears, or -1 if it appears nowhere.				 */
-int free_list_index_of(wanted)
-hdr * wanted;
-{
-    struct hblk * h;
-    hdr * hhdr;
-    int i;
-    
-    for (i = 0; i <= N_HBLK_FLS; ++i) {
-      h = GC_hblkfreelist[i];
-      while (h != 0) {
-        hhdr = HDR(h);
-	if (hhdr == wanted) return i;
-        h = hhdr -> hb_next;
-      }
-    }
-    return -1;
-}
-
-void GC_dump_regions()
-{
-    unsigned i;
-    ptr_t start, end;
-    ptr_t p;
-    size_t bytes;
-    hdr *hhdr;
-    for (i = 0; i < GC_n_heap_sects; ++i) {
-	start = GC_heap_sects[i].hs_start;
-	bytes = GC_heap_sects[i].hs_bytes;
-	end = start + bytes;
-	/* Merge in contiguous sections.	*/
-	  while (i+1 < GC_n_heap_sects && GC_heap_sects[i+1].hs_start == end) {
-	    ++i;
-	    end = GC_heap_sects[i].hs_start + GC_heap_sects[i].hs_bytes;
-	  }
-	GC_printf2("***Section from 0x%lx to 0x%lx\n", start, end);
-	for (p = start; p < end;) {
-	    hhdr = HDR(p);
-	    GC_printf1("\t0x%lx ", (unsigned long)p);
-	    if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-		GC_printf1("Missing header!!(%ld)\n", hhdr);
-		p += HBLKSIZE;
-		continue;
-	    }
-	    if (HBLK_IS_FREE(hhdr)) {
-                int correct_index = GC_hblk_fl_from_blocks(
-					divHBLKSZ(hhdr -> hb_sz));
-	        int actual_index;
-		
-		GC_printf1("\tfree block of size 0x%lx bytes",
-			   (unsigned long)(hhdr -> hb_sz));
-	 	if (IS_MAPPED(hhdr)) {
-		    GC_printf0("\n");
-		} else {
-		    GC_printf0("(unmapped)\n");
-		}
-		actual_index = free_list_index_of(hhdr);
-		if (-1 == actual_index) {
-		    GC_printf1("\t\tBlock not on free list %ld!!\n",
-				correct_index);
-		} else if (correct_index != actual_index) {
-		    GC_printf2("\t\tBlock on list %ld, should be on %ld!!\n",
-			       actual_index, correct_index);
-		}
-		p += hhdr -> hb_sz;
-	    } else {
-		GC_printf1("\tused for blocks of size 0x%lx bytes\n",
-			   (unsigned long)WORDS_TO_BYTES(hhdr -> hb_sz));
-		p += HBLKSIZE * OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz);
-	    }
-	}
-    }
-}
-
-# endif /* NO_DEBUGGING */
-
-/* Initialize hdr for a block containing the indicated size and 	*/
-/* kind of objects.							*/
-/* Return FALSE on failure.						*/
-static GC_bool setup_header(hhdr, sz, kind, flags)
-register hdr * hhdr;
-word sz;	/* object size in words */
-int kind;
-unsigned char flags;
-{
-    register word descr;
-    
-    /* Add description of valid object pointers */
-      if (!GC_add_map_entry(sz)) return(FALSE);
-      hhdr -> hb_map = GC_obj_map[sz > MAXOBJSZ? 0 : sz];
-      
-    /* Set size, kind and mark proc fields */
-      hhdr -> hb_sz = sz;
-      hhdr -> hb_obj_kind = kind;
-      hhdr -> hb_flags = flags;
-      descr = GC_obj_kinds[kind].ok_descriptor;
-      if (GC_obj_kinds[kind].ok_relocate_descr) descr += WORDS_TO_BYTES(sz);
-      hhdr -> hb_descr = descr;
-      
-    /* Clear mark bits */
-      GC_clear_hdr_marks(hhdr);
-      
-    hhdr -> hb_last_reclaimed = (unsigned short)GC_gc_no;
-    return(TRUE);
-}
-
-#define FL_UNKNOWN -1
-/*
- * Remove hhdr from the appropriate free list.
- * We assume it is on the nth free list, or on the size
- * appropriate free list if n is FL_UNKNOWN.
- */
-void GC_remove_from_fl(hhdr, n)
-hdr * hhdr;
-int n;
-{
-    int index;
-
-    GC_ASSERT(((hhdr -> hb_sz) & (HBLKSIZE-1)) == 0);
-#   ifndef USE_MUNMAP
-      /* We always need index to mainatin free counts.	*/
-      if (FL_UNKNOWN == n) {
-          index = GC_hblk_fl_from_blocks(divHBLKSZ(hhdr -> hb_sz));
-      } else {
-	  index = n;
-      }
-#   endif
-    if (hhdr -> hb_prev == 0) {
-#	ifdef USE_MUNMAP
-	  if (FL_UNKNOWN == n) {
-            index = GC_hblk_fl_from_blocks(divHBLKSZ(hhdr -> hb_sz));
-	  } else {
-	    index = n;
-	  }
-#	endif
-	GC_ASSERT(HDR(GC_hblkfreelist[index]) == hhdr);
-	GC_hblkfreelist[index] = hhdr -> hb_next;
-    } else {
-	hdr *phdr;
-	GET_HDR(hhdr -> hb_prev, phdr);
-	phdr -> hb_next = hhdr -> hb_next;
-    }
-    FREE_ASSERT(GC_free_bytes[index] >= hhdr -> hb_sz);
-    INCR_FREE_BYTES(index, - (signed_word)(hhdr -> hb_sz));
-    if (0 != hhdr -> hb_next) {
-	hdr * nhdr;
-	GC_ASSERT(!IS_FORWARDING_ADDR_OR_NIL(NHDR(hhdr)));
-	GET_HDR(hhdr -> hb_next, nhdr);
-	nhdr -> hb_prev = hhdr -> hb_prev;
-    }
-}
-
-/*
- * Return a pointer to the free block ending just before h, if any.
- */
-struct hblk * GC_free_block_ending_at(h)
-struct hblk *h;
-{
-    struct hblk * p = h - 1;
-    hdr * phdr;
-
-    GET_HDR(p, phdr);
-    while (0 != phdr && IS_FORWARDING_ADDR_OR_NIL(phdr)) {
-	p = FORWARDED_ADDR(p,phdr);
-	phdr = HDR(p);
-    }
-    if (0 != phdr) {
-        if(HBLK_IS_FREE(phdr)) {
-	    return p;
-	} else {
-	    return 0;
-	}
-    }
-    p = GC_prev_block(h - 1);
-    if (0 != p) {
-      phdr = HDR(p);
-      if (HBLK_IS_FREE(phdr) && (ptr_t)p + phdr -> hb_sz == (ptr_t)h) {
-	return p;
-      }
-    }
-    return 0;
-}
-
-/*
- * Add hhdr to the appropriate free list.
- * We maintain individual free lists sorted by address.
- */
-void GC_add_to_fl(h, hhdr)
-struct hblk *h;
-hdr * hhdr;
-{
-    int index = GC_hblk_fl_from_blocks(divHBLKSZ(hhdr -> hb_sz));
-    struct hblk *second = GC_hblkfreelist[index];
-    hdr * second_hdr;
-#   ifdef GC_ASSERTIONS
-      struct hblk *next = (struct hblk *)((word)h + hhdr -> hb_sz);
-      hdr * nexthdr = HDR(next);
-      struct hblk *prev = GC_free_block_ending_at(h);
-      hdr * prevhdr = HDR(prev);
-      GC_ASSERT(nexthdr == 0 || !HBLK_IS_FREE(nexthdr) || !IS_MAPPED(nexthdr));
-      GC_ASSERT(prev == 0 || !HBLK_IS_FREE(prevhdr) || !IS_MAPPED(prevhdr));
-#   endif
-    GC_ASSERT(((hhdr -> hb_sz) & (HBLKSIZE-1)) == 0);
-    GC_hblkfreelist[index] = h;
-    INCR_FREE_BYTES(index, hhdr -> hb_sz);
-    FREE_ASSERT(GC_free_bytes[index] <= GC_large_free_bytes)
-    hhdr -> hb_next = second;
-    hhdr -> hb_prev = 0;
-    if (0 != second) {
-      GET_HDR(second, second_hdr);
-      second_hdr -> hb_prev = h;
-    }
-    GC_invalidate_map(hhdr);
-}
-
-#ifdef USE_MUNMAP
-
-/* Unmap blocks that haven't been recently touched.  This is the only way */
-/* way blocks are ever unmapped.					  */
-void GC_unmap_old(void)
-{
-    struct hblk * h;
-    hdr * hhdr;
-    word sz;
-    unsigned short last_rec, threshold;
-    int i;
-#   define UNMAP_THRESHOLD 6
-    
-    for (i = 0; i <= N_HBLK_FLS; ++i) {
-      for (h = GC_hblkfreelist[i]; 0 != h; h = hhdr -> hb_next) {
-        hhdr = HDR(h);
-	if (!IS_MAPPED(hhdr)) continue;
-	threshold = (unsigned short)(GC_gc_no - UNMAP_THRESHOLD);
-	last_rec = hhdr -> hb_last_reclaimed;
-	if ((last_rec > GC_gc_no || last_rec < threshold)
-	    && threshold < GC_gc_no /* not recently wrapped */) {
-          sz = hhdr -> hb_sz;
-	  GC_unmap((ptr_t)h, sz);
-	  hhdr -> hb_flags |= WAS_UNMAPPED;
-    	}
-      }
-    }  
-}
-
-/* Merge all unmapped blocks that are adjacent to other free		*/
-/* blocks.  This may involve remapping, since all blocks are either	*/
-/* fully mapped or fully unmapped.					*/
-void GC_merge_unmapped(void)
-{
-    struct hblk * h, *next;
-    hdr * hhdr, *nexthdr;
-    word size, nextsize;
-    int i;
-    
-    for (i = 0; i <= N_HBLK_FLS; ++i) {
-      h = GC_hblkfreelist[i];
-      while (h != 0) {
-	GET_HDR(h, hhdr);
-	size = hhdr->hb_sz;
-	next = (struct hblk *)((word)h + size);
-	GET_HDR(next, nexthdr);
-	/* Coalesce with successor, if possible */
-	  if (0 != nexthdr && HBLK_IS_FREE(nexthdr)) {
-	    nextsize = nexthdr -> hb_sz;
-	    if (IS_MAPPED(hhdr)) {
-	      GC_ASSERT(!IS_MAPPED(nexthdr));
-	      /* make both consistent, so that we can merge */
-	        if (size > nextsize) {
-		  GC_remap((ptr_t)next, nextsize);
-		} else {
-		  GC_unmap((ptr_t)h, size);
-		  hhdr -> hb_flags |= WAS_UNMAPPED;
-		}
-	    } else if (IS_MAPPED(nexthdr)) {
-	      GC_ASSERT(!IS_MAPPED(hhdr));
-	      if (size > nextsize) {
-		GC_unmap((ptr_t)next, nextsize);
-	      } else {
-		GC_remap((ptr_t)h, size);
-		hhdr -> hb_flags &= ~WAS_UNMAPPED;
-		hhdr -> hb_last_reclaimed = nexthdr -> hb_last_reclaimed;
-	      }
-	    } else {
-	      /* Unmap any gap in the middle */
-		GC_unmap_gap((ptr_t)h, size, (ptr_t)next, nexthdr -> hb_sz);
-	    }
-	    /* If they are both unmapped, we merge, but leave unmapped. */
-	    GC_remove_from_fl(hhdr, i);
-	    GC_remove_from_fl(nexthdr, FL_UNKNOWN);
-	    hhdr -> hb_sz += nexthdr -> hb_sz; 
-	    GC_remove_header(next);
-	    GC_add_to_fl(h, hhdr); 
-	    /* Start over at beginning of list */
-	    h = GC_hblkfreelist[i];
-	  } else /* not mergable with successor */ {
-	    h = hhdr -> hb_next;
-	  }
-      } /* while (h != 0) ... */
-    } /* for ... */
-}
-
-#endif /* USE_MUNMAP */
-
-/*
- * Return a pointer to a block starting at h of length bytes.
- * Memory for the block is mapped.
- * Remove the block from its free list, and return the remainder (if any)
- * to its appropriate free list.
- * May fail by returning 0.
- * The header for the returned block must be set up by the caller.
- * If the return value is not 0, then hhdr is the header for it.
- */
-struct hblk * GC_get_first_part(h, hhdr, bytes, index)
-struct hblk *h;
-hdr * hhdr;
-word bytes;
-int index;
-{
-    word total_size = hhdr -> hb_sz;
-    struct hblk * rest;
-    hdr * rest_hdr;
-
-    GC_ASSERT((total_size & (HBLKSIZE-1)) == 0);
-    GC_remove_from_fl(hhdr, index);
-    if (total_size == bytes) return h;
-    rest = (struct hblk *)((word)h + bytes);
-    rest_hdr = GC_install_header(rest);
-    if (0 == rest_hdr) {
-	/* This may be very bad news ... */
-	WARN("Header allocation failed: Dropping block.\n", 0);
-	return(0);
-    }
-    rest_hdr -> hb_sz = total_size - bytes;
-    rest_hdr -> hb_flags = 0;
-#   ifdef GC_ASSERTIONS
-      /* Mark h not free, to avoid assertion about adjacent free blocks. */
-        hhdr -> hb_map = 0;
-#   endif
-    GC_add_to_fl(rest, rest_hdr);
-    return h;
-}
-
-/*
- * H is a free block.  N points at an address inside it.
- * A new header for n has already been set up.  Fix up h's header
- * to reflect the fact that it is being split, move it to the
- * appropriate free list.
- * N replaces h in the original free list.
- *
- * Nhdr is not completely filled in, since it is about to allocated.
- * It may in fact end up on the wrong free list for its size.
- * (Hence adding it to a free list is silly.  But this path is hopefully
- * rare enough that it doesn't matter.  The code is cleaner this way.)
- */
-void GC_split_block(h, hhdr, n, nhdr, index)
-struct hblk *h;
-hdr * hhdr;
-struct hblk *n;
-hdr * nhdr;
-int index;	/* Index of free list */
-{
-    word total_size = hhdr -> hb_sz;
-    word h_size = (word)n - (word)h;
-    struct hblk *prev = hhdr -> hb_prev;
-    struct hblk *next = hhdr -> hb_next;
-
-    /* Replace h with n on its freelist */
-      nhdr -> hb_prev = prev;
-      nhdr -> hb_next = next;
-      nhdr -> hb_sz = total_size - h_size;
-      nhdr -> hb_flags = 0;
-      if (0 != prev) {
-	HDR(prev) -> hb_next = n;
-      } else {
-        GC_hblkfreelist[index] = n;
-      }
-      if (0 != next) {
-	HDR(next) -> hb_prev = n;
-      }
-      INCR_FREE_BYTES(index, -(signed_word)h_size);
-      FREE_ASSERT(GC_free_bytes[index] > 0);
-#     ifdef GC_ASSERTIONS
-	nhdr -> hb_map = 0;	/* Don't fail test for consecutive	*/
-				/* free blocks in GC_add_to_fl.		*/
-#     endif
-#   ifdef USE_MUNMAP
-      hhdr -> hb_last_reclaimed = GC_gc_no;
-#   endif
-    hhdr -> hb_sz = h_size;
-    GC_add_to_fl(h, hhdr);
-    GC_invalidate_map(nhdr);
-}
-	
-struct hblk * GC_allochblk_nth();
-
-/*
- * Allocate (and return pointer to) a heap block
- *   for objects of size sz words, searching the nth free list.
- *
- * NOTE: We set obj_map field in header correctly.
- *       Caller is responsible for building an object freelist in block.
- *
- * Unlike older versions of the collectors, the client is responsible
- * for clearing the block, if necessary.
- */
-struct hblk *
-GC_allochblk(sz, kind, flags)
-word sz;
-int kind;
-unsigned flags;  /* IGNORE_OFF_PAGE or 0 */
-{
-    word blocks = OBJ_SZ_TO_BLOCKS(sz);
-    int start_list = GC_hblk_fl_from_blocks(blocks);
-    int i;
-    for (i = start_list; i <= N_HBLK_FLS; ++i) {
-	struct hblk * result = GC_allochblk_nth(sz, kind, flags, i);
-	if (0 != result) {
-	    return result;
-	}
-    }
-    return 0;
-}
-/*
- * The same, but with search restricted to nth free list.
- */
-struct hblk *
-GC_allochblk_nth(sz, kind, flags, n)
-word sz;
-int kind;
-unsigned char flags;  /* IGNORE_OFF_PAGE or 0 */
-int n;
-{
-    register struct hblk *hbp;
-    register hdr * hhdr;		/* Header corr. to hbp */
-    register struct hblk *thishbp;
-    register hdr * thishdr;		/* Header corr. to hbp */
-    signed_word size_needed;    /* number of bytes in requested objects */
-    signed_word size_avail;	/* bytes available in this block	*/
-
-    size_needed = HBLKSIZE * OBJ_SZ_TO_BLOCKS(sz);
-
-    /* search for a big enough block in free list */
-	hbp = GC_hblkfreelist[n];
-	for(; 0 != hbp; hbp = hhdr -> hb_next) {
-	    GET_HDR(hbp, hhdr);
-	    size_avail = hhdr->hb_sz;
-	    if (size_avail < size_needed) continue;
-	    if (size_avail != size_needed
-		&& !GC_use_entire_heap
-		&& !GC_dont_gc
-		&& USED_HEAP_SIZE >= GC_requested_heapsize
-		&& !TRUE_INCREMENTAL && GC_should_collect()) {
-#		ifdef USE_MUNMAP
-		    continue;
-#		else
-		    /* If we have enough large blocks left to cover any	*/
-		    /* previous request for large blocks, we go ahead	*/
-		    /* and split.  Assuming a steady state, that should	*/
-		    /* be safe.  It means that we can use the full 	*/
-		    /* heap if we allocate only small objects.		*/
-		    if (!GC_enough_large_bytes_left(GC_large_allocd_bytes, n)) {
-		      continue;
-		    } 
-		    /* If we are deallocating lots of memory from	*/
-		    /* finalizers, fail and collect sooner rather	*/
-		    /* than later.					*/
-		    if (WORDS_TO_BYTES(GC_finalizer_mem_freed)
-			> (GC_heapsize >> 4))  {
-		      continue;
-		    }
-#		endif /* !USE_MUNMAP */
-	    }
-	    /* If the next heap block is obviously better, go on.	*/
-	    /* This prevents us from disassembling a single large block */
-	    /* to get tiny blocks.					*/
-	    {
-	      signed_word next_size;
-	      
-	      thishbp = hhdr -> hb_next;
-	      if (thishbp != 0) {
-		GET_HDR(thishbp, thishdr);
-	        next_size = (signed_word)(thishdr -> hb_sz);
-	        if (next_size < size_avail
-	          && next_size >= size_needed
-	          && !GC_is_black_listed(thishbp, (word)size_needed)) {
-	          continue;
-	        }
-	      }
-	    }
-	    if ( !IS_UNCOLLECTABLE(kind) &&
-	         (kind != PTRFREE || size_needed > MAX_BLACK_LIST_ALLOC)) {
-	      struct hblk * lasthbp = hbp;
-	      ptr_t search_end = (ptr_t)hbp + size_avail - size_needed;
-	      signed_word orig_avail = size_avail;
-	      signed_word eff_size_needed = ((flags & IGNORE_OFF_PAGE)?
-	      					HBLKSIZE
-	      					: size_needed);
-	      
-	      
-	      while ((ptr_t)lasthbp <= search_end
-	             && (thishbp = GC_is_black_listed(lasthbp,
-	             				      (word)eff_size_needed))
-		        != 0) {
-	        lasthbp = thishbp;
-	      }
-	      size_avail -= (ptr_t)lasthbp - (ptr_t)hbp;
-	      thishbp = lasthbp;
-	      if (size_avail >= size_needed) {
-	        if (thishbp != hbp &&
-		    0 != (thishdr = GC_install_header(thishbp))) {
-		  /* Make sure it's mapped before we mangle it. */
-#		    ifdef USE_MUNMAP
-		      if (!IS_MAPPED(hhdr)) {
-		        GC_remap((ptr_t)hbp, hhdr -> hb_sz);
-		        hhdr -> hb_flags &= ~WAS_UNMAPPED;
-		      }
-#		    endif
-	          /* Split the block at thishbp */
-		      GC_split_block(hbp, hhdr, thishbp, thishdr, n);
-		  /* Advance to thishbp */
-		      hbp = thishbp;
-		      hhdr = thishdr;
-		      /* We must now allocate thishbp, since it may	*/
-		      /* be on the wrong free list.			*/
-		}
-	      } else if (size_needed > (signed_word)BL_LIMIT
-	                 && orig_avail - size_needed
-			    > (signed_word)BL_LIMIT) {
-	        /* Punt, since anything else risks unreasonable heap growth. */
-		if (++GC_large_alloc_warn_suppressed
-		    >= GC_large_alloc_warn_interval) {
-	          WARN("Repeated allocation of very large block "
-		       "(appr. size %ld):\n"
-		       "\tMay lead to memory leak and poor performance.\n",
-		       size_needed);
-		  GC_large_alloc_warn_suppressed = 0;
-		}
-	        size_avail = orig_avail;
-	      } else if (size_avail == 0 && size_needed == HBLKSIZE
-			 && IS_MAPPED(hhdr)) {
-		if (!GC_find_leak) {
-	      	  static unsigned count = 0;
-	      	  
-	      	  /* The block is completely blacklisted.  We need 	*/
-	      	  /* to drop some such blocks, since otherwise we spend */
-	      	  /* all our time traversing them if pointerfree	*/
-	      	  /* blocks are unpopular.				*/
-	          /* A dropped block will be reconsidered at next GC.	*/
-	          if ((++count & 3) == 0) {
-	            /* Allocate and drop the block in small chunks, to	*/
-	            /* maximize the chance that we will recover some	*/
-	            /* later.						*/
-		      word total_size = hhdr -> hb_sz;
-	              struct hblk * limit = hbp + divHBLKSZ(total_size);
-	              struct hblk * h;
-		      struct hblk * prev = hhdr -> hb_prev;
-	              
-		      GC_words_wasted += BYTES_TO_WORDS(total_size);
-		      GC_large_free_bytes -= total_size;
-		      GC_remove_from_fl(hhdr, n);
-	              for (h = hbp; h < limit; h++) {
-	                if (h == hbp || 0 != (hhdr = GC_install_header(h))) {
-	                  (void) setup_header(
-	                	  hhdr,
-	              		  BYTES_TO_WORDS(HBLKSIZE),
-	              		  PTRFREE, 0); /* Cant fail */
-	              	  if (GC_debugging_started) {
-	              	    BZERO(h, HBLKSIZE);
-	              	  }
-	                }
-	              }
-	            /* Restore hbp to point at free block */
-		      hbp = prev;
-		      if (0 == hbp) {
-			return GC_allochblk_nth(sz, kind, flags, n);
-		      }
-	   	      hhdr = HDR(hbp);
-	          }
-		}
-	      }
-	    }
-	    if( size_avail >= size_needed ) {
-#		ifdef USE_MUNMAP
-		  if (!IS_MAPPED(hhdr)) {
-		    GC_remap((ptr_t)hbp, hhdr -> hb_sz);
-		    hhdr -> hb_flags &= ~WAS_UNMAPPED;
-		  }
-#	        endif
-		/* hbp may be on the wrong freelist; the parameter n	*/
-		/* is important.					*/
-		hbp = GC_get_first_part(hbp, hhdr, size_needed, n);
-		break;
-	    }
-	}
-
-    if (0 == hbp) return 0;
-	
-    /* Add it to map of valid blocks */
-    	if (!GC_install_counts(hbp, (word)size_needed)) return(0);
-    	/* This leaks memory under very rare conditions. */
-    		
-    /* Set up header */
-        if (!setup_header(hhdr, sz, kind, flags)) {
-            GC_remove_counts(hbp, (word)size_needed);
-            return(0); /* ditto */
-        }
-
-    /* Notify virtual dirty bit implementation that we are about to write.  */
-    /* Ensure that pointerfree objects are not protected if it's avoidable. */
-    	GC_remove_protection(hbp, divHBLKSZ(size_needed),
-			     (hhdr -> hb_descr == 0) /* pointer-free */);
-        
-    /* We just successfully allocated a block.  Restart count of	*/
-    /* consecutive failures.						*/
-    {
-	extern unsigned GC_fail_count;
-	
-	GC_fail_count = 0;
-    }
-
-    GC_large_free_bytes -= size_needed;
-    
-    GC_ASSERT(IS_MAPPED(hhdr));
-    return( hbp );
-}
- 
-struct hblk * GC_freehblk_ptr = 0;  /* Search position hint for GC_freehblk */
-
-/*
- * Free a heap block.
- *
- * Coalesce the block with its neighbors if possible.
- *
- * All mark words are assumed to be cleared.
- */
-void
-GC_freehblk(hbp)
-struct hblk *hbp;
-{
-struct hblk *next, *prev;
-hdr *hhdr, *prevhdr, *nexthdr;
-signed_word size;
-
-
-    GET_HDR(hbp, hhdr);
-    size = hhdr->hb_sz;
-    size = HBLKSIZE * OBJ_SZ_TO_BLOCKS(size);
-    GC_remove_counts(hbp, (word)size);
-    hhdr->hb_sz = size;
-#   ifdef USE_MUNMAP
-      hhdr -> hb_last_reclaimed = GC_gc_no;
-#   endif
-    
-    /* Check for duplicate deallocation in the easy case */
-      if (HBLK_IS_FREE(hhdr)) {
-        GC_printf1("Duplicate large block deallocation of 0x%lx\n",
-        	   (unsigned long) hbp);
-	ABORT("Duplicate large block deallocation");
-      }
-
-    GC_ASSERT(IS_MAPPED(hhdr));
-    GC_invalidate_map(hhdr);
-    next = (struct hblk *)((word)hbp + size);
-    GET_HDR(next, nexthdr);
-    prev = GC_free_block_ending_at(hbp);
-    /* Coalesce with successor, if possible */
-      if(0 != nexthdr && HBLK_IS_FREE(nexthdr) && IS_MAPPED(nexthdr)) {
-	GC_remove_from_fl(nexthdr, FL_UNKNOWN);
-	hhdr -> hb_sz += nexthdr -> hb_sz; 
-	GC_remove_header(next);
-      }
-    /* Coalesce with predecessor, if possible. */
-      if (0 != prev) {
-	prevhdr = HDR(prev);
-	if (IS_MAPPED(prevhdr)) {
-	  GC_remove_from_fl(prevhdr, FL_UNKNOWN);
-	  prevhdr -> hb_sz += hhdr -> hb_sz;
-#	  ifdef USE_MUNMAP
-	    prevhdr -> hb_last_reclaimed = GC_gc_no;
-#	  endif
-	  GC_remove_header(hbp);
-	  hbp = prev;
-	  hhdr = prevhdr;
-	}
-      }
-    /* FIXME: It is not clear we really always want to do these merges	*/
-    /* with -DUSE_MUNMAP, since it updates ages and hence prevents	*/
-    /* unmapping. 							*/
-
-    GC_large_free_bytes += size;
-    GC_add_to_fl(hbp, hhdr);    
-}
-
diff --git a/boehm-gc/alloc.c b/boehm-gc/alloc.c
deleted file mode 100644
index 9b4869f91b2..00000000000
--- a/boehm-gc/alloc.c
+++ /dev/null
@@ -1,1099 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1998 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-
-# include "private/gc_priv.h"
-
-# include <stdio.h>
-# if !defined(MACOS) && !defined(MSWINCE)
-#   include <signal.h>
-#   include <sys/types.h>
-# endif
-
-/*
- * Separate free lists are maintained for different sized objects
- * up to MAXOBJSZ.
- * The call GC_allocobj(i,k) ensures that the freelist for
- * kind k objects of size i points to a non-empty
- * free list. It returns a pointer to the first entry on the free list.
- * In a single-threaded world, GC_allocobj may be called to allocate
- * an object of (small) size i as follows:
- *
- *            opp = &(GC_objfreelist[i]);
- *            if (*opp == 0) GC_allocobj(i, NORMAL);
- *            ptr = *opp;
- *            *opp = obj_link(ptr);
- *
- * Note that this is very fast if the free list is non-empty; it should
- * only involve the execution of 4 or 5 simple instructions.
- * All composite objects on freelists are cleared, except for
- * their first word.
- */
-
-/*
- *  The allocator uses GC_allochblk to allocate large chunks of objects.
- * These chunks all start on addresses which are multiples of
- * HBLKSZ.   Each allocated chunk has an associated header,
- * which can be located quickly based on the address of the chunk.
- * (See headers.c for details.) 
- * This makes it possible to check quickly whether an
- * arbitrary address corresponds to an object administered by the
- * allocator.
- */
-
-word GC_non_gc_bytes = 0;  /* Number of bytes not intended to be collected */
-
-word GC_gc_no = 0;
-
-#ifndef SMALL_CONFIG
-  int GC_incremental = 0;  /* By default, stop the world.	*/
-#endif
-
-int GC_parallel = FALSE;   /* By default, parallel GC is off.	*/
-
-int GC_full_freq = 19;	   /* Every 20th collection is a full	*/
-			   /* collection, whether we need it 	*/
-			   /* or not.			        */
-
-GC_bool GC_need_full_gc = FALSE;
-			   /* Need full GC do to heap growth.	*/
-
-#ifdef THREADS
-  GC_bool GC_world_stopped = FALSE;
-# define IF_THREADS(x) x
-#else
-# define IF_THREADS(x)
-#endif
-
-word GC_used_heap_size_after_full = 0;
-
-char * GC_copyright[] =
-{"Copyright 1988,1989 Hans-J. Boehm and Alan J. Demers ",
-"Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved. ",
-"Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved. ",
-"Copyright (c) 1999-2001 by Hewlett-Packard Company.  All rights reserved. ",
-"THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY",
-" EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.",
-"See source code for details." };
-
-# include "version.h"
-
-#if defined(SAVE_CALL_CHAIN) && \
-	!(defined(REDIRECT_MALLOC) && defined(GC_HAVE_BUILTIN_BACKTRACE))
-#   define SAVE_CALL_CHAIN_IN_GC
-    /* This is only safe if the call chain save mechanism won't end up	*/
-    /* calling GC_malloc.  The GNU C library documentation suggests 	*/
-    /* that backtrace doesn't use malloc, but at least the initial	*/
-    /* call in some versions does seem to invoke the dynamic linker,	*/
-    /* which uses malloc.						*/
-#endif
-
-/* some more variables */
-
-extern signed_word GC_mem_found;  /* Number of reclaimed longwords	*/
-				  /* after garbage collection      	*/
-
-GC_bool GC_dont_expand = 0;
-
-word GC_free_space_divisor = 3;
-
-extern GC_bool GC_collection_in_progress();
-		/* Collection is in progress, or was abandoned.	*/
-
-int GC_never_stop_func GC_PROTO((void)) { return(0); }
-
-unsigned long GC_time_limit = TIME_LIMIT;
-
-CLOCK_TYPE GC_start_time;  	/* Time at which we stopped world.	*/
-				/* used only in GC_timeout_stop_func.	*/
-
-int GC_n_attempts = 0;		/* Number of attempts at finishing	*/
-				/* collection within GC_time_limit.	*/
-
-#if defined(SMALL_CONFIG) || defined(NO_CLOCK)
-#   define GC_timeout_stop_func GC_never_stop_func
-#else
-  int GC_timeout_stop_func GC_PROTO((void))
-  {
-    CLOCK_TYPE current_time;
-    static unsigned count = 0;
-    unsigned long time_diff;
-    
-    if ((count++ & 3) != 0) return(0);
-    GET_TIME(current_time);
-    time_diff = MS_TIME_DIFF(current_time,GC_start_time);
-    if (time_diff >= GC_time_limit) {
-#   	ifdef CONDPRINT
-	  if (GC_print_stats) {
-	    GC_printf0("Abandoning stopped marking after ");
-	    GC_printf1("%lu msecs", (unsigned long)time_diff);
-	    GC_printf1("(attempt %ld)\n", (unsigned long) GC_n_attempts);
-	  }
-#	endif
-    	return(1);
-    }
-    return(0);
-  }
-#endif /* !SMALL_CONFIG */
-
-/* Return the minimum number of words that must be allocated between	*/
-/* collections to amortize the collection cost.				*/
-static word min_words_allocd()
-{
-#   ifdef THREADS
- 	/* We punt, for now. */
- 	register signed_word stack_size = 10000;
-#   else
-        int dummy;
-        register signed_word stack_size = (ptr_t)(&dummy) - GC_stackbottom;
-#   endif
-    word total_root_size;  	    /* includes double stack size,	*/
-    				    /* since the stack is expensive	*/
-    				    /* to scan.				*/
-    word scan_size;		/* Estimate of memory to be scanned 	*/
-				/* during normal GC.			*/
-    
-    if (stack_size < 0) stack_size = -stack_size;
-    total_root_size = 2 * stack_size + GC_root_size;
-    scan_size = BYTES_TO_WORDS(GC_heapsize - GC_large_free_bytes
-			       + (GC_large_free_bytes >> 2)
-				   /* use a bit more of large empty heap */
-			       + total_root_size);
-    if (TRUE_INCREMENTAL) {
-        return scan_size / (2 * GC_free_space_divisor);
-    } else {
-        return scan_size / GC_free_space_divisor;
-    }
-}
-
-/* Return the number of words allocated, adjusted for explicit storage	*/
-/* management, etc..  This number is used in deciding when to trigger	*/
-/* collections.								*/
-word GC_adj_words_allocd()
-{
-    register signed_word result;
-    register signed_word expl_managed =
-    		BYTES_TO_WORDS((long)GC_non_gc_bytes
-    				- (long)GC_non_gc_bytes_at_gc);
-    
-    /* Don't count what was explicitly freed, or newly allocated for	*/
-    /* explicit management.  Note that deallocating an explicitly	*/
-    /* managed object should not alter result, assuming the client	*/
-    /* is playing by the rules.						*/
-    result = (signed_word)GC_words_allocd
-    	     - (signed_word)GC_mem_freed 
-	     + (signed_word)GC_finalizer_mem_freed - expl_managed;
-    if (result > (signed_word)GC_words_allocd) {
-        result = GC_words_allocd;
-    	/* probably client bug or unfortunate scheduling */
-    }
-    result += GC_words_finalized;
-    	/* We count objects enqueued for finalization as though they	*/
-    	/* had been reallocated this round. Finalization is user	*/
-    	/* visible progress.  And if we don't count this, we have	*/
-    	/* stability problems for programs that finalize all objects.	*/
-    if ((GC_words_wasted >> 3) < result)
-        result += GC_words_wasted;
-     	/* This doesn't reflect useful work.  But if there is lots of	*/
-     	/* new fragmentation, the same is probably true of the heap,	*/
-     	/* and the collection will be correspondingly cheaper.		*/
-    if (result < (signed_word)(GC_words_allocd >> 3)) {
-    	/* Always count at least 1/8 of the allocations.  We don't want	*/
-    	/* to collect too infrequently, since that would inhibit	*/
-    	/* coalescing of free storage blocks.				*/
-    	/* This also makes us partially robust against client bugs.	*/
-        return(GC_words_allocd >> 3);
-    } else {
-        return(result);
-    }
-}
-
-
-/* Clear up a few frames worth of garbage left at the top of the stack.	*/
-/* This is used to prevent us from accidentally treating garbade left	*/
-/* on the stack by other parts of the collector as roots.  This 	*/
-/* differs from the code in misc.c, which actually tries to keep the	*/
-/* stack clear of long-lived, client-generated garbage.			*/
-void GC_clear_a_few_frames()
-{
-#   define NWORDS 64
-    word frames[NWORDS];
-    /* Some compilers will warn that frames was set but never used.	*/
-    /* That's the whole idea ...					*/
-    register int i;
-    
-    for (i = 0; i < NWORDS; i++) frames[i] = 0;
-}
-
-/* Heap size at which we need a collection to avoid expanding past	*/
-/* limits used by blacklisting.						*/
-static word GC_collect_at_heapsize = (word)(-1);
-
-/* Have we allocated enough to amortize a collection? */
-GC_bool GC_should_collect()
-{
-    return(GC_adj_words_allocd() >= min_words_allocd()
-	   || GC_heapsize >= GC_collect_at_heapsize);
-}
-
-
-void GC_notify_full_gc()
-{
-    if (GC_start_call_back != (void (*) GC_PROTO((void)))0) {
-	(*GC_start_call_back)();
-    }
-}
-
-GC_bool GC_is_full_gc = FALSE;
-
-/* 
- * Initiate a garbage collection if appropriate.
- * Choose judiciously
- * between partial, full, and stop-world collections.
- * Assumes lock held, signals disabled.
- */
-void GC_maybe_gc()
-{
-    static int n_partial_gcs = 0;
-
-    if (GC_should_collect()) {
-        if (!GC_incremental) {
-            GC_gcollect_inner();
-            n_partial_gcs = 0;
-            return;
-        } else {
-#   	  ifdef PARALLEL_MARK
-	    GC_wait_for_reclaim();
-#   	  endif
-	  if (GC_need_full_gc || n_partial_gcs >= GC_full_freq) {
-#   	    ifdef CONDPRINT
-	      if (GC_print_stats) {
-	        GC_printf2(
-	          "***>Full mark for collection %lu after %ld allocd bytes\n",
-     		  (unsigned long) GC_gc_no+1,
-	   	  (long)WORDS_TO_BYTES(GC_words_allocd));
-	      }
-#           endif
-	    GC_promote_black_lists();
-	    (void)GC_reclaim_all((GC_stop_func)0, TRUE);
-	    GC_clear_marks();
-            n_partial_gcs = 0;
-	    GC_notify_full_gc();
- 	    GC_is_full_gc = TRUE;
-          } else {
-            n_partial_gcs++;
-          }
-	}
-        /* We try to mark with the world stopped.	*/
-        /* If we run out of time, this turns into	*/
-        /* incremental marking.			*/
-#	ifndef NO_CLOCK
-          if (GC_time_limit != GC_TIME_UNLIMITED) { GET_TIME(GC_start_time); }
-#	endif
-        if (GC_stopped_mark(GC_time_limit == GC_TIME_UNLIMITED? 
-			    GC_never_stop_func : GC_timeout_stop_func)) {
-#           ifdef SAVE_CALL_CHAIN_IN_GC
-                GC_save_callers(GC_last_stack);
-#           endif
-            GC_finish_collection();
-        } else {
-	    if (!GC_is_full_gc) {
-		/* Count this as the first attempt */
-	        GC_n_attempts++;
-	    }
-	}
-    }
-}
-
-
-/*
- * Stop the world garbage collection.  Assumes lock held, signals disabled.
- * If stop_func is not GC_never_stop_func, then abort if stop_func returns TRUE.
- * Return TRUE if we successfully completed the collection.
- */
-GC_bool GC_try_to_collect_inner(stop_func)
-GC_stop_func stop_func;
-{
-#   ifdef CONDPRINT
-        CLOCK_TYPE start_time, current_time;
-#   endif
-    if (GC_dont_gc) return FALSE;
-    if (GC_incremental && GC_collection_in_progress()) {
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-	GC_printf0(
-	    "GC_try_to_collect_inner: finishing collection in progress\n");
-      }
-#   endif /* CONDPRINT */
-      /* Just finish collection already in progress.	*/
-    	while(GC_collection_in_progress()) {
-    	    if (stop_func()) return(FALSE);
-    	    GC_collect_a_little_inner(1);
-    	}
-    }
-    if (stop_func == GC_never_stop_func) GC_notify_full_gc();
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-        if (GC_print_stats) GET_TIME(start_time);
-	GC_printf2(
-	   "Initiating full world-stop collection %lu after %ld allocd bytes\n",
-	   (unsigned long) GC_gc_no+1,
-	   (long)WORDS_TO_BYTES(GC_words_allocd));
-      }
-#   endif
-    GC_promote_black_lists();
-    /* Make sure all blocks have been reclaimed, so sweep routines	*/
-    /* don't see cleared mark bits.					*/
-    /* If we're guaranteed to finish, then this is unnecessary.		*/
-    /* In the find_leak case, we have to finish to guarantee that 	*/
-    /* previously unmarked objects are not reported as leaks.		*/
-#       ifdef PARALLEL_MARK
-	    GC_wait_for_reclaim();
-#       endif
- 	if ((GC_find_leak || stop_func != GC_never_stop_func)
-	    && !GC_reclaim_all(stop_func, FALSE)) {
-	    /* Aborted.  So far everything is still consistent.	*/
-	    return(FALSE);
-	}
-    GC_invalidate_mark_state();  /* Flush mark stack.	*/
-    GC_clear_marks();
-#   ifdef SAVE_CALL_CHAIN_IN_GC
-        GC_save_callers(GC_last_stack);
-#   endif
-    GC_is_full_gc = TRUE;
-    if (!GC_stopped_mark(stop_func)) {
-      if (!GC_incremental) {
-    	/* We're partially done and have no way to complete or use 	*/
-    	/* current work.  Reestablish invariants as cheaply as		*/
-    	/* possible.							*/
-    	GC_invalidate_mark_state();
-	GC_unpromote_black_lists();
-      } /* else we claim the world is already still consistent.  We'll 	*/
-        /* finish incrementally.					*/
-      return(FALSE);
-    }
-    GC_finish_collection();
-#   if defined(CONDPRINT)
-      if (GC_print_stats) {
-        GET_TIME(current_time);
-        GC_printf1("Complete collection took %lu msecs\n",
-                   MS_TIME_DIFF(current_time,start_time));
-      }
-#   endif
-    return(TRUE);
-}
-
-
-
-/*
- * Perform n units of garbage collection work.  A unit is intended to touch
- * roughly GC_RATE pages.  Every once in a while, we do more than that.
- * This needa to be a fairly large number with our current incremental
- * GC strategy, since otherwise we allocate too much during GC, and the
- * cleanup gets expensive.
- */
-# define GC_RATE 10 
-# define MAX_PRIOR_ATTEMPTS 1
- 	/* Maximum number of prior attempts at world stop marking	*/
- 	/* A value of 1 means that we finish the second time, no matter */
- 	/* how long it takes.  Doesn't count the initial root scan	*/
- 	/* for a full GC.						*/
-
-int GC_deficit = 0;	/* The number of extra calls to GC_mark_some	*/
-			/* that we have made.				*/
-
-void GC_collect_a_little_inner(n)
-int n;
-{
-    register int i;
-    
-    if (GC_dont_gc) return;
-    if (GC_incremental && GC_collection_in_progress()) {
-    	for (i = GC_deficit; i < GC_RATE*n; i++) {
-    	    if (GC_mark_some((ptr_t)0)) {
-    	        /* Need to finish a collection */
-#     		ifdef SAVE_CALL_CHAIN_IN_GC
-        	    GC_save_callers(GC_last_stack);
-#     		endif
-#		ifdef PARALLEL_MARK
-		    GC_wait_for_reclaim();
-#		endif
-		if (GC_n_attempts < MAX_PRIOR_ATTEMPTS
-		    && GC_time_limit != GC_TIME_UNLIMITED) {
-		  GET_TIME(GC_start_time);
-		  if (!GC_stopped_mark(GC_timeout_stop_func)) {
-		    GC_n_attempts++;
-		    break;
-		  }
-		} else {
-		  (void)GC_stopped_mark(GC_never_stop_func);
-		}
-    	        GC_finish_collection();
-    	        break;
-    	    }
-    	}
-    	if (GC_deficit > 0) GC_deficit -= GC_RATE*n;
-	if (GC_deficit < 0) GC_deficit = 0;
-    } else {
-        GC_maybe_gc();
-    }
-}
-
-int GC_collect_a_little GC_PROTO(())
-{
-    int result;
-    DCL_LOCK_STATE;
-
-    DISABLE_SIGNALS();
-    LOCK();
-    GC_collect_a_little_inner(1);
-    result = (int)GC_collection_in_progress();
-    UNLOCK();
-    ENABLE_SIGNALS();
-    if (!result && GC_debugging_started) GC_print_all_smashed();
-    return(result);
-}
-
-/*
- * Assumes lock is held, signals are disabled.
- * We stop the world.
- * If stop_func() ever returns TRUE, we may fail and return FALSE.
- * Increment GC_gc_no if we succeed.
- */
-GC_bool GC_stopped_mark(stop_func)
-GC_stop_func stop_func;
-{
-    register int i;
-    int dummy;
-#   if defined(PRINTTIMES) || defined(CONDPRINT)
-	CLOCK_TYPE start_time, current_time;
-#   endif
-	
-#   ifdef PRINTTIMES
-	GET_TIME(start_time);
-#   endif
-#   if defined(CONDPRINT) && !defined(PRINTTIMES)
-	if (GC_print_stats) GET_TIME(start_time);
-#   endif
-#   if defined(REGISTER_LIBRARIES_EARLY)
-        GC_cond_register_dynamic_libraries();
-#   endif
-    STOP_WORLD();
-    IF_THREADS(GC_world_stopped = TRUE);
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-	GC_printf1("--> Marking for collection %lu ",
-	           (unsigned long) GC_gc_no + 1);
-	GC_printf2("after %lu allocd bytes + %lu wasted bytes\n",
-	   	   (unsigned long) WORDS_TO_BYTES(GC_words_allocd),
-	   	   (unsigned long) WORDS_TO_BYTES(GC_words_wasted));
-      }
-#   endif
-#   ifdef MAKE_BACK_GRAPH
-      if (GC_print_back_height) {
-        GC_build_back_graph();
-      }
-#   endif
-
-    /* Mark from all roots.  */
-        /* Minimize junk left in my registers and on the stack */
-            GC_clear_a_few_frames();
-            GC_noop(0,0,0,0,0,0);
-	GC_initiate_gc();
-	for(i = 0;;i++) {
-	    if ((*stop_func)()) {
-#   		    ifdef CONDPRINT
-		      if (GC_print_stats) {
-		    	GC_printf0("Abandoned stopped marking after ");
-			GC_printf1("%lu iterations\n",
-				   (unsigned long)i);
-		      }
-#		    endif
-		    GC_deficit = i; /* Give the mutator a chance. */
-                    IF_THREADS(GC_world_stopped = FALSE);
-	            START_WORLD();
-	            return(FALSE);
-	    }
-	    if (GC_mark_some((ptr_t)(&dummy))) break;
-	}
-	
-    GC_gc_no++;
-#   ifdef PRINTSTATS
-      GC_printf2("Collection %lu reclaimed %ld bytes",
-		  (unsigned long) GC_gc_no - 1,
-	   	  (long)WORDS_TO_BYTES(GC_mem_found));
-#   else
-#     ifdef CONDPRINT
-        if (GC_print_stats) {
-	  GC_printf1("Collection %lu finished", (unsigned long) GC_gc_no - 1);
-	}
-#     endif
-#   endif /* !PRINTSTATS */
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-        GC_printf1(" ---> heapsize = %lu bytes\n",
-      	           (unsigned long) GC_heapsize);
-        /* Printf arguments may be pushed in funny places.  Clear the	*/
-        /* space.							*/
-        GC_printf0("");
-      }
-#   endif  /* CONDPRINT  */
-
-    /* Check all debugged objects for consistency */
-        if (GC_debugging_started) {
-            (*GC_check_heap)();
-        }
-    
-    IF_THREADS(GC_world_stopped = FALSE);
-    START_WORLD();
-#   ifdef PRINTTIMES
-	GET_TIME(current_time);
-	GC_printf1("World-stopped marking took %lu msecs\n",
-	           MS_TIME_DIFF(current_time,start_time));
-#   else
-#     ifdef CONDPRINT
-	if (GC_print_stats) {
-	  GET_TIME(current_time);
-	  GC_printf1("World-stopped marking took %lu msecs\n",
-	             MS_TIME_DIFF(current_time,start_time));
-	}
-#     endif
-#   endif
-    return(TRUE);
-}
-
-/* Set all mark bits for the free list whose first entry is q	*/
-#ifdef __STDC__
-  void GC_set_fl_marks(ptr_t q)
-#else
-  void GC_set_fl_marks(q)
-  ptr_t q;
-#endif
-{
-   ptr_t p;
-   struct hblk * h, * last_h = 0;
-   hdr *hhdr;
-   int word_no;
-
-   for (p = q; p != 0; p = obj_link(p)){
-	h = HBLKPTR(p);
-	if (h != last_h) {
-	  last_h = h; 
-	  hhdr = HDR(h);
-	}
-	word_no = (((word *)p) - ((word *)h));
-	set_mark_bit_from_hdr(hhdr, word_no);
-   }
-}
-
-/* Clear all mark bits for the free list whose first entry is q	*/
-/* Decrement GC_mem_found by number of words on free list.	*/
-#ifdef __STDC__
-  void GC_clear_fl_marks(ptr_t q)
-#else
-  void GC_clear_fl_marks(q)
-  ptr_t q;
-#endif
-{
-   ptr_t p;
-   struct hblk * h, * last_h = 0;
-   hdr *hhdr;
-   int word_no;
-
-   for (p = q; p != 0; p = obj_link(p)){
-	h = HBLKPTR(p);
-	if (h != last_h) {
-	  last_h = h; 
-	  hhdr = HDR(h);
-	}
-	word_no = (((word *)p) - ((word *)h));
-	clear_mark_bit_from_hdr(hhdr, word_no);
-#	ifdef GATHERSTATS
-	    GC_mem_found -= hhdr -> hb_sz;
-#	endif
-   }
-}
-
-/* Finish up a collection.  Assumes lock is held, signals are disabled,	*/
-/* but the world is otherwise running.					*/
-void GC_finish_collection()
-{
-#   ifdef PRINTTIMES
-	CLOCK_TYPE start_time;
-	CLOCK_TYPE finalize_time;
-	CLOCK_TYPE done_time;
-	
-	GET_TIME(start_time);
-	finalize_time = start_time;
-#   endif
-
-#   ifdef GATHERSTATS
-        GC_mem_found = 0;
-#   endif
-#   if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
-	if (getenv("GC_PRINT_ADDRESS_MAP") != 0) {
-	  GC_print_address_map();
-	}
-#   endif
-    COND_DUMP;
-    if (GC_find_leak) {
-      /* Mark all objects on the free list.  All objects should be */
-      /* marked when we're done.				   */
-	{
-	  register word size;		/* current object size		*/
-	  int kind;
-	  ptr_t q;
-
-	  for (kind = 0; kind < GC_n_kinds; kind++) {
-	    for (size = 1; size <= MAXOBJSZ; size++) {
-	      q = GC_obj_kinds[kind].ok_freelist[size];
-	      if (q != 0) GC_set_fl_marks(q);
-	    }
-	  }
-	}
-	GC_start_reclaim(TRUE);
-	  /* The above just checks; it doesn't really reclaim anything. */
-    }
-
-    GC_finalize();
-#   ifdef STUBBORN_ALLOC
-      GC_clean_changing_list();
-#   endif
-
-#   ifdef PRINTTIMES
-      GET_TIME(finalize_time);
-#   endif
-
-    if (GC_print_back_height) {
-#     ifdef MAKE_BACK_GRAPH
-	GC_traverse_back_graph();
-#     else
-#	ifndef SMALL_CONFIG
-	  GC_err_printf0("Back height not available: "
-		         "Rebuild collector with -DMAKE_BACK_GRAPH\n");
-#  	endif
-#     endif
-    }
-
-    /* Clear free list mark bits, in case they got accidentally marked   */
-    /* (or GC_find_leak is set and they were intentionally marked).	 */
-    /* Also subtract memory remaining from GC_mem_found count.           */
-    /* Note that composite objects on free list are cleared.             */
-    /* Thus accidentally marking a free list is not a problem;  only     */
-    /* objects on the list itself will be marked, and that's fixed here. */
-      {
-	register word size;		/* current object size		*/
-	register ptr_t q;	/* pointer to current object	*/
-	int kind;
-
-	for (kind = 0; kind < GC_n_kinds; kind++) {
-	  for (size = 1; size <= MAXOBJSZ; size++) {
-	    q = GC_obj_kinds[kind].ok_freelist[size];
-	    if (q != 0) GC_clear_fl_marks(q);
-	  }
-	}
-      }
-
-
-#   ifdef PRINTSTATS
-	GC_printf1("Bytes recovered before sweep - f.l. count = %ld\n",
-	          (long)WORDS_TO_BYTES(GC_mem_found));
-#   endif
-    /* Reconstruct free lists to contain everything not marked */
-        GC_start_reclaim(FALSE);
-        if (GC_is_full_gc)  {
-	    GC_used_heap_size_after_full = USED_HEAP_SIZE;
-	    GC_need_full_gc = FALSE;
-	} else {
-	    GC_need_full_gc =
-		 BYTES_TO_WORDS(USED_HEAP_SIZE - GC_used_heap_size_after_full)
-		 > min_words_allocd();
-	}
-
-#   ifdef PRINTSTATS
-	GC_printf2(
-		  "Immediately reclaimed %ld bytes in heap of size %lu bytes",
-	          (long)WORDS_TO_BYTES(GC_mem_found),
-	          (unsigned long)GC_heapsize);
-#	ifdef USE_MUNMAP
-	  GC_printf1("(%lu unmapped)", GC_unmapped_bytes);
-#	endif
-	GC_printf2(
-		"\n%lu (atomic) + %lu (composite) collectable bytes in use\n",
-	        (unsigned long)WORDS_TO_BYTES(GC_atomic_in_use),
-	        (unsigned long)WORDS_TO_BYTES(GC_composite_in_use));
-#   endif
-
-      GC_n_attempts = 0;
-      GC_is_full_gc = FALSE;
-    /* Reset or increment counters for next cycle */
-      GC_words_allocd_before_gc += GC_words_allocd;
-      GC_non_gc_bytes_at_gc = GC_non_gc_bytes;
-      GC_words_allocd = 0;
-      GC_words_wasted = 0;
-      GC_mem_freed = 0;
-      GC_finalizer_mem_freed = 0;
-      
-#   ifdef USE_MUNMAP
-      GC_unmap_old();
-#   endif
-#   ifdef PRINTTIMES
-	GET_TIME(done_time);
-	GC_printf2("Finalize + initiate sweep took %lu + %lu msecs\n",
-	           MS_TIME_DIFF(finalize_time,start_time),
-	           MS_TIME_DIFF(done_time,finalize_time));
-#   endif
-}
-
-/* Externally callable routine to invoke full, stop-world collection */
-# if defined(__STDC__) || defined(__cplusplus)
-    int GC_try_to_collect(GC_stop_func stop_func)
-# else
-    int GC_try_to_collect(stop_func)
-    GC_stop_func stop_func;
-# endif
-{
-    int result;
-    DCL_LOCK_STATE;
-    
-    if (GC_debugging_started) GC_print_all_smashed();
-    GC_INVOKE_FINALIZERS();
-    DISABLE_SIGNALS();
-    LOCK();
-    ENTER_GC();
-    if (!GC_is_initialized) GC_init_inner();
-    /* Minimize junk left in my registers */
-      GC_noop(0,0,0,0,0,0);
-    result = (int)GC_try_to_collect_inner(stop_func);
-    EXIT_GC();
-    UNLOCK();
-    ENABLE_SIGNALS();
-    if(result) {
-        if (GC_debugging_started) GC_print_all_smashed();
-        GC_INVOKE_FINALIZERS();
-    }
-    return(result);
-}
-
-void GC_gcollect GC_PROTO(())
-{
-    (void)GC_try_to_collect(GC_never_stop_func);
-    if (GC_have_errors) GC_print_all_errors();
-}
-
-word GC_n_heap_sects = 0;	/* Number of sections currently in heap. */
-
-/*
- * Use the chunk of memory starting at p of size bytes as part of the heap.
- * Assumes p is HBLKSIZE aligned, and bytes is a multiple of HBLKSIZE.
- */
-void GC_add_to_heap(p, bytes)
-struct hblk *p;
-word bytes;
-{
-    word words;
-    hdr * phdr;
-    
-    if (GC_n_heap_sects >= MAX_HEAP_SECTS) {
-    	ABORT("Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS");
-    }
-    phdr = GC_install_header(p);
-    if (0 == phdr) {
-    	/* This is extremely unlikely. Can't add it.  This will		*/
-    	/* almost certainly result in a	0 return from the allocator,	*/
-    	/* which is entirely appropriate.				*/
-    	return;
-    }
-    GC_heap_sects[GC_n_heap_sects].hs_start = (ptr_t)p;
-    GC_heap_sects[GC_n_heap_sects].hs_bytes = bytes;
-    GC_n_heap_sects++;
-    words = BYTES_TO_WORDS(bytes);
-    phdr -> hb_sz = words;
-    phdr -> hb_map = (unsigned char *)1;   /* A value != GC_invalid_map	*/
-    phdr -> hb_flags = 0;
-    GC_freehblk(p);
-    GC_heapsize += bytes;
-    if ((ptr_t)p <= (ptr_t)GC_least_plausible_heap_addr
-        || GC_least_plausible_heap_addr == 0) {
-        GC_least_plausible_heap_addr = (GC_PTR)((ptr_t)p - sizeof(word));
-        	/* Making it a little smaller than necessary prevents	*/
-        	/* us from getting a false hit from the variable	*/
-        	/* itself.  There's some unintentional reflection	*/
-        	/* here.						*/
-    }
-    if ((ptr_t)p + bytes >= (ptr_t)GC_greatest_plausible_heap_addr) {
-        GC_greatest_plausible_heap_addr = (GC_PTR)((ptr_t)p + bytes);
-    }
-}
-
-# if !defined(NO_DEBUGGING)
-void GC_print_heap_sects()
-{
-    register unsigned i;
-    
-    GC_printf1("Total heap size: %lu\n", (unsigned long) GC_heapsize);
-    for (i = 0; i < GC_n_heap_sects; i++) {
-        unsigned long start = (unsigned long) GC_heap_sects[i].hs_start;
-        unsigned long len = (unsigned long) GC_heap_sects[i].hs_bytes;
-        struct hblk *h;
-        unsigned nbl = 0;
-        
-    	GC_printf3("Section %ld from 0x%lx to 0x%lx ", (unsigned long)i,
-    		   start, (unsigned long)(start + len));
-    	for (h = (struct hblk *)start; h < (struct hblk *)(start + len); h++) {
-    	    if (GC_is_black_listed(h, HBLKSIZE)) nbl++;
-    	}
-    	GC_printf2("%lu/%lu blacklisted\n", (unsigned long)nbl,
-    		   (unsigned long)(len/HBLKSIZE));
-    }
-}
-# endif
-
-GC_PTR GC_least_plausible_heap_addr = (GC_PTR)ONES;
-GC_PTR GC_greatest_plausible_heap_addr = 0;
-
-ptr_t GC_max(x,y)
-ptr_t x, y;
-{
-    return(x > y? x : y);
-}
-
-ptr_t GC_min(x,y)
-ptr_t x, y;
-{
-    return(x < y? x : y);
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_set_max_heap_size(GC_word n)
-# else
-    void GC_set_max_heap_size(n)
-    GC_word n;
-# endif
-{
-    GC_max_heapsize = n;
-}
-
-GC_word GC_max_retries = 0;
-
-/*
- * this explicitly increases the size of the heap.  It is used
- * internally, but may also be invoked from GC_expand_hp by the user.
- * The argument is in units of HBLKSIZE.
- * Tiny values of n are rounded up.
- * Returns FALSE on failure.
- */
-GC_bool GC_expand_hp_inner(n)
-word n;
-{
-    word bytes;
-    struct hblk * space;
-    word expansion_slop;	/* Number of bytes by which we expect the */
-    				/* heap to expand soon.			  */
-
-    if (n < MINHINCR) n = MINHINCR;
-    bytes = n * HBLKSIZE;
-    /* Make sure bytes is a multiple of GC_page_size */
-      {
-	word mask = GC_page_size - 1;
-	bytes += mask;
-	bytes &= ~mask;
-      }
-    
-    if (GC_max_heapsize != 0 && GC_heapsize + bytes > GC_max_heapsize) {
-        /* Exceeded self-imposed limit */
-        return(FALSE);
-    }
-    space = GET_MEM(bytes);
-    if( space == 0 ) {
-#	ifdef CONDPRINT
-	  if (GC_print_stats) {
-	    GC_printf1("Failed to expand heap by %ld bytes\n",
-		       (unsigned long)bytes);
-	  }
-#       endif
-	return(FALSE);
-    }
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-	GC_printf2("Increasing heap size by %lu after %lu allocated bytes\n",
-	           (unsigned long)bytes,
-	           (unsigned long)WORDS_TO_BYTES(GC_words_allocd));
-# 	ifdef UNDEFINED
-	  GC_printf1("Root size = %lu\n", GC_root_size);
-	  GC_print_block_list(); GC_print_hblkfreelist();
-	  GC_printf0("\n");
-#	endif
-      }
-#   endif
-    expansion_slop = WORDS_TO_BYTES(min_words_allocd()) + 4*MAXHINCR*HBLKSIZE;
-    if (GC_last_heap_addr == 0 && !((word)space & SIGNB)
-        || (GC_last_heap_addr != 0 && GC_last_heap_addr < (ptr_t)space)) {
-        /* Assume the heap is growing up */
-        GC_greatest_plausible_heap_addr =
-            (GC_PTR)GC_max((ptr_t)GC_greatest_plausible_heap_addr,
-                           (ptr_t)space + bytes + expansion_slop);
-    } else {
-        /* Heap is growing down */
-        GC_least_plausible_heap_addr =
-            (GC_PTR)GC_min((ptr_t)GC_least_plausible_heap_addr,
-                           (ptr_t)space - expansion_slop);
-    }
-#   if defined(LARGE_CONFIG)
-      if (((ptr_t)GC_greatest_plausible_heap_addr <= (ptr_t)space + bytes
-           || (ptr_t)GC_least_plausible_heap_addr >= (ptr_t)space)
-	  && GC_heapsize > 0) {
-	/* GC_add_to_heap will fix this, but ... */
-	WARN("Too close to address space limit: blacklisting ineffective\n", 0);
-      }
-#   endif
-    GC_prev_heap_addr = GC_last_heap_addr;
-    GC_last_heap_addr = (ptr_t)space;
-    GC_add_to_heap(space, bytes);
-    /* Force GC before we are likely to allocate past expansion_slop */
-      GC_collect_at_heapsize =
-	  GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE;
-#     if defined(LARGE_CONFIG)
-        if (GC_collect_at_heapsize < GC_heapsize /* wrapped */)
-	  GC_collect_at_heapsize = (word)(-1);
-#     endif
-    return(TRUE);
-}
-
-/* Really returns a bool, but it's externally visible, so that's clumsy. */
-/* Arguments is in bytes.						*/
-# if defined(__STDC__) || defined(__cplusplus)
-  int GC_expand_hp(size_t bytes)
-# else
-  int GC_expand_hp(bytes)
-  size_t bytes;
-# endif
-{
-    int result;
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    if (!GC_is_initialized) GC_init_inner();
-    result = (int)GC_expand_hp_inner(divHBLKSZ((word)bytes));
-    if (result) GC_requested_heapsize += bytes;
-    UNLOCK();
-    ENABLE_SIGNALS();
-    return(result);
-}
-
-unsigned GC_fail_count = 0;  
-			/* How many consecutive GC/expansion failures?	*/
-			/* Reset by GC_allochblk.			*/
-
-GC_bool GC_collect_or_expand(needed_blocks, ignore_off_page)
-word needed_blocks;
-GC_bool ignore_off_page;
-{
-    if (!GC_incremental && !GC_dont_gc &&
-	((GC_dont_expand && GC_words_allocd > 0) || GC_should_collect())) {
-      GC_gcollect_inner();
-    } else {
-      word blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
-      			   + needed_blocks;
-      
-      if (blocks_to_get > MAXHINCR) {
-          word slop;
-          
-	  /* Get the minimum required to make it likely that we		*/
-	  /* can satisfy the current request in the presence of black-	*/
-	  /* listing.  This will probably be more than MAXHINCR.	*/
-          if (ignore_off_page) {
-              slop = 4;
-          } else {
-	      slop = 2*divHBLKSZ(BL_LIMIT);
-	      if (slop > needed_blocks) slop = needed_blocks;
-	  }
-          if (needed_blocks + slop > MAXHINCR) {
-              blocks_to_get = needed_blocks + slop;
-          } else {
-              blocks_to_get = MAXHINCR;
-          }
-      }
-      if (!GC_expand_hp_inner(blocks_to_get)
-        && !GC_expand_hp_inner(needed_blocks)) {
-      	if (GC_fail_count++ < GC_max_retries) {
-      	    WARN("Out of Memory!  Trying to continue ...\n", 0);
-	    GC_gcollect_inner();
-	} else {
-#	    if !defined(AMIGA) || !defined(GC_AMIGA_FASTALLOC)
-	      WARN("Out of Memory!  Returning NIL!\n", 0);
-#	    endif
-	    return(FALSE);
-	}
-      } else {
-#	  ifdef CONDPRINT
-            if (GC_fail_count && GC_print_stats) {
-	      GC_printf0("Memory available again ...\n");
-	    }
-#	  endif
-      }
-    }
-    return(TRUE);
-}
-
-/*
- * Make sure the object free list for sz is not empty.
- * Return a pointer to the first object on the free list.
- * The object MUST BE REMOVED FROM THE FREE LIST BY THE CALLER.
- * Assumes we hold the allocator lock and signals are disabled.
- *
- */
-ptr_t GC_allocobj(sz, kind)
-word sz;
-int kind;
-{
-    ptr_t * flh = &(GC_obj_kinds[kind].ok_freelist[sz]);
-    GC_bool tried_minor = FALSE;
-    
-    if (sz == 0) return(0);
-
-    while (*flh == 0) {
-      ENTER_GC();
-      /* Do our share of marking work */
-        if(TRUE_INCREMENTAL) GC_collect_a_little_inner(1);
-      /* Sweep blocks for objects of this size */
-        GC_continue_reclaim(sz, kind);
-      EXIT_GC();
-      if (*flh == 0) {
-        GC_new_hblk(sz, kind);
-      }
-      if (*flh == 0) {
-        ENTER_GC();
-	if (GC_incremental && GC_time_limit == GC_TIME_UNLIMITED
-	    && ! tried_minor ) {
-	    GC_collect_a_little_inner(1);
-	    tried_minor = TRUE;
-	} else {
-          if (!GC_collect_or_expand((word)1,FALSE)) {
-	    EXIT_GC();
-	    return(0);
-	  }
-	}
-	EXIT_GC();
-      }
-    }
-    /* Successful allocation; reset failure count.	*/
-    GC_fail_count = 0;
-    
-    return(*flh);
-}
diff --git a/boehm-gc/alpha_mach_dep.S b/boehm-gc/alpha_mach_dep.S
deleted file mode 100644
index d4def2405f9..00000000000
--- a/boehm-gc/alpha_mach_dep.S
+++ /dev/null
@@ -1,86 +0,0 @@
-	.arch ev6
-
-        .text
-        .align  4
-        .globl  GC_push_regs
-        .ent    GC_push_regs 2
-GC_push_regs:
-	ldgp    $gp, 0($27)
-	lda     $sp, -16($sp)
-	stq     $26, 0($sp)
-        .mask   0x04000000, 0
-        .frame  $sp, 16, $26, 0
-
-/* $0		integer result                                                */
-/* $1-$8	temp regs - not preserved cross calls                         */
-/* $9-$15	call saved regs                                               */
-/* $16-$21	argument regs - not preserved cross calls                     */
-/* $22-$28	temp regs - not preserved cross calls                         */
-/* $29		global pointer - not preserved cross calls                    */
-/* $30		stack pointer                                                 */
-
-# define call_push(x)			\
-	mov   x, $16;			\
-	jsr   $26, GC_push_one;		\
-	ldgp  $gp, 0($26)
-	
-        call_push($9)
-        call_push($10)
-        call_push($11)
-        call_push($12)
-        call_push($13)
-        call_push($14)
-        call_push($15)
-
-/* $f0-$f1	floating point results                                        */
-/* $f2-$f9	call saved regs                                               */
-/* $f10-$f30	temp regs - not preserved cross calls                         */
-
-	/* Use the most efficient transfer method for this hardware. */
-	/* Bit 1 detects the FIX extension, which includes ftoit. */
-	amask	2, $0
-	bne	$0, $use_stack
-
-#undef call_push
-#define call_push(x)			\
-	ftoit	x, $16;			\
-	jsr	$26, GC_push_one;	\
-	ldgp	$gp, 0($26)
-
-	call_push($f2)
-	call_push($f3)
-	call_push($f4)
-	call_push($f5)
-	call_push($f6)
-	call_push($f7)
-	call_push($f8)
-	call_push($f9)
-
-	ldq     $26, 0($sp)
-	lda     $sp, 16($sp)
-	ret     $31, ($26), 1
-
-	.align	4
-$use_stack:
-
-#undef call_push
-#define call_push(x)			\
-	stt	x, 8($sp);		\
-	ldq	$16, 8($sp);		\
-	jsr	$26, GC_push_one;	\
-	ldgp	$gp, 0($26)
-
-	call_push($f2)
-	call_push($f3)
-	call_push($f4)
-	call_push($f5)
-	call_push($f6)
-	call_push($f7)
-	call_push($f8)
-	call_push($f9)
-
-	ldq     $26, 0($sp)
-	lda     $sp, 16($sp)
-	ret     $31, ($26), 1
-
-	.end    GC_push_regs
diff --git a/boehm-gc/backgraph.c b/boehm-gc/backgraph.c
deleted file mode 100644
index 94757c89158..00000000000
--- a/boehm-gc/backgraph.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Copyright (c) 2001 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-/*
- * This implements a full, though not well-tuned, representation of the
- * backwards points-to graph.  This is used to test for non-GC-robust
- * data structures; the code is not used during normal garbage collection.
- *
- * One restriction is that we drop all back-edges from nodes with very
- * high in-degree, and simply add them add them to a list of such
- * nodes.  They are then treated as permanent roots.  Id this by itself
- * doesn't introduce a space leak, then such nodes can't contribute to
- * a growing space leak.
- */
-
-#include "gc.h"	/* For configuration information. */
-
-#ifdef MAKE_BACK_GRAPH
-
-#define MAX_IN	10	/* Maximum in-degree we handle directly */
-
-#include "private/dbg_mlc.h"
-#include <unistd.h>
-
-#if !defined(DBG_HDRS_ALL) || (ALIGNMENT != CPP_WORDSZ/8) || !defined(UNIX_LIKE)
-# error Configuration doesnt support MAKE_BACK_GRAPH
-#endif
-
-/* We store single back pointers directly in the object's oh_bg_ptr field.   */
-/* If there is more than one ptr to an object, we store q | FLAG_MANY, 	     */
-/* where q is a pointer to a back_edges object.				     */
-/* Every once in a while we use a back_edges object even for a single	     */
-/* pointer, since we need the other fields in the back_edges structure to    */
-/* be present in some fraction of the objects.  Otherwise we get serious     */
-/* performance issues.							     */
-#define FLAG_MANY 2
-
-typedef struct back_edges_struct {
-  word n_edges;	/* Number of edges, including those in continuation	*/
-  		/* structures.						*/
-  unsigned short flags;
-#	define RETAIN 1	/* Directly points to a reachable object;	*/
-  			/* retain for next GC.				*/
-  unsigned short height_gc_no;
-  		/* If height > 0, then the GC_gc_no value when it	*/
-  		/* was computed.  If it was computed this cycle, then	*/
-  		/* it is current.  If it was computed during the	*/
-  		/* last cycle, then it represents the old height,	*/
-  		/* which is only saved for live objects referenced by	*/
-  		/* dead ones.  This may grow due to refs from newly	*/
-		/* dead objects.				        */
-  signed_word height;
-  		/* Longest path through unreachable nodes to this node	*/
-  		/* that we found using depth first search.		*/
-  
-#   define HEIGHT_UNKNOWN ((signed_word)(-2))
-#   define HEIGHT_IN_PROGRESS ((signed_word)(-1))
-  ptr_t edges[MAX_IN];
-  struct back_edges_struct *cont;
-  		/* Pointer to continuation structure; we use only the	*/
-  		/* edges field in the continuation.			*/
-  		/* also used as free list link.				*/
-} back_edges;
-
-/* Allocate a new back edge structure.  Should be more sophisticated	*/
-/* if this were production code.					*/
-#define MAX_BACK_EDGE_STRUCTS 100000
-static back_edges *back_edge_space = 0;
-int GC_n_back_edge_structs = 0;	/* Serves as pointer to never used	*/
-				/* back_edges space.			*/
-static back_edges *avail_back_edges = 0;
-				/* Pointer to free list of deallocated	*/
-				/* back_edges structures.		*/
-
-static back_edges * new_back_edges(void)
-{
-  if (0 == back_edge_space) {
-    back_edge_space = (back_edges *)
-	    		GET_MEM(MAX_BACK_EDGE_STRUCTS*sizeof(back_edges));
-  }
-  if (0 != avail_back_edges) {
-    back_edges * result = avail_back_edges;
-    avail_back_edges = result -> cont;
-    result -> cont = 0;
-    return result;
-  }
-  if (GC_n_back_edge_structs >= MAX_BACK_EDGE_STRUCTS - 1) {
-    ABORT("needed too much space for back edges: adjust "
-	  "MAX_BACK_EDGE_STRUCTS");
-  }
-  return back_edge_space + (GC_n_back_edge_structs++);
-}
-
-/* Deallocate p and its associated continuation structures.	*/
-static void deallocate_back_edges(back_edges *p)
-{
-   back_edges *last = p;
-
-   while (0 != last -> cont) last = last -> cont;
-   last -> cont = avail_back_edges;
-   avail_back_edges = p;
-}
-
-/* Table of objects that are currently on the depth-first search	*/
-/* stack.  Only objects with in-degree one are in this table.		*/
-/* Other objects are identified using HEIGHT_IN_PROGRESS.		*/
-/* FIXME: This data structure NEEDS IMPROVEMENT.			*/
-#define INITIAL_IN_PROGRESS 10000
-static ptr_t * in_progress_space = 0;
-static size_t in_progress_size = 0;
-static size_t n_in_progress = 0;
-
-static void push_in_progress(ptr_t p)
-{
-  if (n_in_progress >= in_progress_size) 
-    if (in_progress_size == 0) {
-      in_progress_size = INITIAL_IN_PROGRESS;
-      in_progress_space = (ptr_t *)GET_MEM(in_progress_size * sizeof(ptr_t));
-    } else {
-      ptr_t * new_in_progress_space;
-      in_progress_size *= 2;
-      new_in_progress_space = (ptr_t *)
-	      			GET_MEM(in_progress_size * sizeof(ptr_t));
-      BCOPY(in_progress_space, new_in_progress_space,
-	    n_in_progress * sizeof(ptr_t));
-      in_progress_space = new_in_progress_space;
-      /* FIXME: This just drops the old space.	*/
-    }
-  if (in_progress_space == 0)
-      ABORT("MAKE_BACK_GRAPH: Out of in-progress space: "
-	    "Huge linear data structure?");
-  in_progress_space[n_in_progress++] = p;
-}
-
-static GC_bool is_in_progress(ptr_t p)
-{
-  int i;
-  for (i = 0; i < n_in_progress; ++i) {
-    if (in_progress_space[i] == p) return TRUE;
-  }
-  return FALSE;
-}
-
-static void pop_in_progress(ptr_t p)
-{
-  --n_in_progress;
-  GC_ASSERT(in_progress_space[n_in_progress] == p);
-}
-
-#define GET_OH_BG_PTR(p) \
-		(ptr_t)REVEAL_POINTER(((oh *)(p)) -> oh_bg_ptr)
-#define SET_OH_BG_PTR(p,q) (((oh *)(p)) -> oh_bg_ptr) = HIDE_POINTER(q)
-
-/* Execute s once for each predecessor q of p in the points-to graph. 	*/
-/* s should be a bracketed statement.  We declare q.			*/
-#define FOR_EACH_PRED(q, p, s) \
-  { \
-    ptr_t q = GET_OH_BG_PTR(p); \
-    if (!((word)q & FLAG_MANY)) { \
-      if (q && !((word)q & 1)) s \
-	      /* !((word)q & 1) checks for a misnterpreted freelist link */ \
-    } else { \
-      back_edges *orig_be_ = (back_edges *)((word)q & ~FLAG_MANY); \
-      back_edges *be_ = orig_be_; \
-      int total_, local_; \
-      int n_edges_ = be_ -> n_edges; \
-      for (total_ = 0, local_ = 0; total_ < n_edges_; ++local_, ++total_) { \
-	  if (local_ == MAX_IN) { \
-	      be_ = be_ -> cont; \
-	      local_ = 0; \
-	  } \
-	  q = be_ -> edges[local_]; s \
-      } \
-    } \
-  }
-
-/* Ensure that p has a back_edges structure associated with it.	*/
-static void ensure_struct(ptr_t p)
-{
-  ptr_t old_back_ptr = GET_OH_BG_PTR(p);
-
-  if (!((word)old_back_ptr & FLAG_MANY)) {
-    back_edges *be = new_back_edges();
-    be -> flags = 0;
-    if (0 == old_back_ptr) {
-      be -> n_edges = 0;
-    } else {
-      be -> n_edges = 1;
-      be -> edges[0] = old_back_ptr;
-    }
-    be -> height = HEIGHT_UNKNOWN;
-    be -> height_gc_no = GC_gc_no - 1;
-    GC_ASSERT(be >= back_edge_space);
-    SET_OH_BG_PTR(p, (word)be | FLAG_MANY);
-  }
-}
-
-/* Add the (forward) edge from p to q to the backward graph.  Both p	*/
-/* q are pointers to the object base, i.e. pointers to an oh.		*/
-static void add_edge(ptr_t p,  ptr_t q)
-{
-    ptr_t old_back_ptr = GET_OH_BG_PTR(q);
-    back_edges * be, *be_cont;
-    word i;
-    static unsigned random_number = 13;
-#   define GOT_LUCKY_NUMBER (((++random_number) & 0x7f) == 0)
-      /* A not very random number we use to occasionally allocate a	*/
-      /* back_edges structure even for a single backward edge.  This	*/
-      /* prevents us from repeatedly tracing back through very long	*/
-      /* chains, since we will have some place to store height and	*/
-      /* in_progress flags along the way.				*/
-
-    GC_ASSERT(p == GC_base(p) && q == GC_base(q));
-    if (!GC_HAS_DEBUG_INFO(q) || !GC_HAS_DEBUG_INFO(p)) {
-      /* This is really a misinterpreted free list link, since we saw */
-      /* a pointer to a free list.  Dont overwrite it!		      */
-      return;
-    }
-    if (0 == old_back_ptr) {
-	SET_OH_BG_PTR(q, p);
-	if (GOT_LUCKY_NUMBER) ensure_struct(q);
-	return;
-    }
-    /* Check whether it was already in the list of predecessors. */
-      FOR_EACH_PRED(pred, q, { if (p == pred) return; });
-    ensure_struct(q);
-    old_back_ptr = GET_OH_BG_PTR(q);
-    be = (back_edges *)((word)old_back_ptr & ~FLAG_MANY);
-    for (i = be -> n_edges, be_cont = be; i > MAX_IN;
-	be_cont = be_cont -> cont, i -= MAX_IN) {}
-    if (i == MAX_IN) {
-	be_cont -> cont = new_back_edges();
-	be_cont = be_cont -> cont;
-	i = 0;
-    }
-    be_cont -> edges[i] = p;
-    be -> n_edges++;
-    if (be -> n_edges == 100) {
-#       if 0
-	  if (GC_print_stats) {
-	    GC_err_printf0("The following object has in-degree >= 100:\n");
-	    GC_print_heap_obj(q);
-	  }
-#	endif
-    }
-}
-
-typedef void (*per_object_func)(ptr_t p, word n_words, word gc_descr);
-
-static void per_object_helper(struct hblk *h, word fn)
-{
-  hdr * hhdr = HDR(h);
-  word sz = hhdr -> hb_sz;
-  word descr = hhdr -> hb_descr;
-  per_object_func f = (per_object_func)fn;
-  int i = 0;
-
-  do {
-    f((ptr_t)(h -> hb_body + i), sz, descr);
-    i += sz;
-  } while (i + sz <= BYTES_TO_WORDS(HBLKSIZE));
-}
-
-void GC_apply_to_each_object(per_object_func f)
-{
-  GC_apply_to_all_blocks(per_object_helper, (word)f);
-}
-
-static void reset_back_edge(ptr_t p, word n_words, word gc_descr)
-{
-  /* Skip any free list links, or dropped blocks */
-  if (GC_HAS_DEBUG_INFO(p)) {
-    ptr_t old_back_ptr = GET_OH_BG_PTR(p);
-    if ((word)old_back_ptr & FLAG_MANY) {
-      back_edges *be = (back_edges *)((word)old_back_ptr & ~FLAG_MANY);
-      if (!(be -> flags & RETAIN)) {
-	deallocate_back_edges(be);
-        SET_OH_BG_PTR(p, 0); 
-      } else {
-        word *currentp;
-
-	GC_ASSERT(GC_is_marked(p));
-
-	/* Back edges may point to objects that will not be retained. 	*/
-	/* Delete them for now, but remember the height.		*/
-	/* Some will be added back at next GC.				*/
-	  be -> n_edges = 0;
-	  if (0 != be -> cont) {
-	    deallocate_back_edges(be -> cont);
-	    be -> cont = 0;
-	  }
-
-	GC_ASSERT(GC_is_marked(p));
-
-	/* We only retain things for one GC cycle at a time.		*/
-	  be -> flags &= ~RETAIN;
-      }
-    } else /* Simple back pointer */ {
-      /* Clear to avoid dangling pointer. */
-      SET_OH_BG_PTR(p, 0);
-    }
-  }
-}
-
-static void add_back_edges(ptr_t p, word n_words, word gc_descr)
-{
-  word *currentp = (word *)(p + sizeof(oh));
-
-  /* For now, fix up non-length descriptors conservatively.	*/
-    if((gc_descr & GC_DS_TAGS) != GC_DS_LENGTH) {
-      gc_descr = WORDS_TO_BYTES(n_words);
-    }
-  while (currentp < (word *)(p + gc_descr)) {
-    word current = *currentp++;
-    FIXUP_POINTER(current);
-    if (current >= (word)GC_least_plausible_heap_addr && 
-	current <= (word)GC_greatest_plausible_heap_addr) {
-       ptr_t target = GC_base((GC_PTR)current);
-       if (0 != target) {
-	 add_edge(p, target);
-       }
-    }
-  }
-}
-
-/* Rebuild the representation of the backward reachability graph.	*/
-/* Does not examine mark bits.  Can be called before GC.		*/
-void GC_build_back_graph(void)
-{
-  GC_apply_to_each_object(add_back_edges);
-}
-
-/* Return an approximation to the length of the longest simple path	*/
-/* through unreachable objects to p.  We refer to this as the height	*/
-/* of p.								*/
-static word backwards_height(ptr_t p)
-{
-  word result;
-  ptr_t back_ptr = GET_OH_BG_PTR(p);
-  back_edges *be;
-
-  if (0 == back_ptr) return 1;
-  if (!((word)back_ptr & FLAG_MANY)) {
-    if (is_in_progress(p)) return 0;  /* DFS back edge, i.e. we followed  */
-    				      /* an edge to an object already	  */
-    				      /* on our stack: ignore		  */
-    push_in_progress(p);
-    result = backwards_height(back_ptr)+1;
-    pop_in_progress(p);
-    return result;
-  }
-  be = (back_edges *)((word)back_ptr & ~FLAG_MANY);
-  if (be -> height >= 0 && be -> height_gc_no == GC_gc_no)
-      return be -> height;
-  /* Ignore back edges in DFS */
-    if (be -> height == HEIGHT_IN_PROGRESS) return 0;
-  result = (be -> height > 0? be -> height : 1);
-  be -> height = HEIGHT_IN_PROGRESS;
-  FOR_EACH_PRED(q, p, {
-    word this_height;
-    if (GC_is_marked(q) && !(FLAG_MANY & (word)GET_OH_BG_PTR(p))) {
-      if (GC_print_stats)
-	  GC_printf2("Found bogus pointer from 0x%lx to 0x%lx\n", q, p);
-	/* Reachable object "points to" unreachable one.		*/
-	/* Could be caused by our lax treatment of GC descriptors.	*/
-      this_height = 1;
-    } else {
-        this_height = backwards_height(q);
-    }
-    if (this_height >= result) result = this_height + 1;
-  });
-  be -> height = result;
-  be -> height_gc_no = GC_gc_no;
-  return result;
-}
-
-word GC_max_height;
-ptr_t GC_deepest_obj;
-
-/* Compute the maximum height of every unreachable predecessor p of  a 	*/
-/* reachable object.  Arrange to save the heights of all such objects p	*/
-/* so that they can be used in calculating the height of objects in the	*/
-/* next GC.								*/
-/* Set GC_max_height to be the maximum height we encounter, and 	*/
-/* GC_deepest_obj to be the corresponding object.			*/
-static void update_max_height(ptr_t p, word n_words, word gc_descr)
-{
-  if (GC_is_marked(p) && GC_HAS_DEBUG_INFO(p)) {
-    int i;
-    word p_height = 0;
-    ptr_t p_deepest_obj = 0;
-    ptr_t back_ptr;
-    back_edges *be = 0;
-
-    /* If we remembered a height last time, use it as a minimum.	*/
-    /* It may have increased due to newly unreachable chains pointing	*/
-    /* to p, but it can't have decreased.				*/
-    back_ptr = GET_OH_BG_PTR(p);
-    if (0 != back_ptr && ((word)back_ptr & FLAG_MANY)) {
-      be = (back_edges *)((word)back_ptr & ~FLAG_MANY);
-      if (be -> height != HEIGHT_UNKNOWN) p_height = be -> height;
-    }
-    FOR_EACH_PRED(q, p, {
-      if (!GC_is_marked(q) && GC_HAS_DEBUG_INFO(q)) {
-        word q_height;
-
-        q_height = backwards_height(q);
-	if (q_height > p_height) {
-	  p_height = q_height;
-	  p_deepest_obj = q;
-	}
-      }
-    });
-    if (p_height > 0) {
-      /* Remember the height for next time. */
-	if (be == 0) {
-    	  ensure_struct(p);
-    	  back_ptr = GET_OH_BG_PTR(p);
-  	  be = (back_edges *)((word)back_ptr & ~FLAG_MANY);
-	}
-	be -> flags |= RETAIN;
-	be -> height = p_height;
-	be -> height_gc_no = GC_gc_no;
-    }
-    if (p_height > GC_max_height) {
-	GC_max_height = p_height;
-	GC_deepest_obj = p_deepest_obj;
-    }
-  }
-}
-
-word GC_max_max_height = 0;
-
-void GC_traverse_back_graph(void)
-{
-  GC_max_height = 0;
-  GC_apply_to_each_object(update_max_height);
-}
-
-void GC_print_back_graph_stats(void)
-{
-  GC_printf2("Maximum backwards height of reachable objects at GC %lu is %ld\n",
-	     (unsigned long) GC_gc_no, GC_max_height);
-  if (GC_max_height > GC_max_max_height) {
-    GC_max_max_height = GC_max_height;
-    GC_printf0("The following unreachable object is last in a longest chain "
-	       "of unreachable objects:\n");
-    GC_print_heap_obj(GC_deepest_obj);
-  }
-  if (GC_print_stats) {
-    GC_printf1("Needed max total of %ld back-edge structs\n",
-	       GC_n_back_edge_structs);
-  }
-  GC_apply_to_each_object(reset_back_edge);
-  GC_deepest_obj = 0;
-}
-
-#endif /* MAKE_BACK_GRAPH */
diff --git a/boehm-gc/blacklst.c b/boehm-gc/blacklst.c
deleted file mode 100644
index ae2f95cb3fe..00000000000
--- a/boehm-gc/blacklst.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, August 9, 1995 6:09 pm PDT */
-# include "private/gc_priv.h"
-
-/*
- * We maintain several hash tables of hblks that have had false hits.
- * Each contains one bit per hash bucket;  If any page in the bucket
- * has had a false hit, we assume that all of them have.
- * See the definition of page_hash_table in gc_private.h.
- * False hits from the stack(s) are much more dangerous than false hits
- * from elsewhere, since the former can pin a large object that spans the
- * block, eventhough it does not start on the dangerous block.
- */
- 
-/*
- * Externally callable routines are:
- 
- * GC_add_to_black_list_normal
- * GC_add_to_black_list_stack
- * GC_promote_black_lists
- * GC_is_black_listed
- *
- * All require that the allocator lock is held.
- */
-
-/* Pointers to individual tables.  We replace one table by another by 	*/
-/* switching these pointers. 						*/
-word * GC_old_normal_bl;
-		/* Nonstack false references seen at last full		*/
-		/* collection.						*/
-word * GC_incomplete_normal_bl;
-		/* Nonstack false references seen since last		*/
-		/* full collection.					*/
-word * GC_old_stack_bl;
-word * GC_incomplete_stack_bl;
-
-word GC_total_stack_black_listed;
-
-word GC_black_list_spacing = MINHINCR*HBLKSIZE;  /* Initial rough guess */
-
-void GC_clear_bl();
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_default_print_heap_obj_proc(ptr_t p)
-# else
-    void GC_default_print_heap_obj_proc(p)
-    ptr_t p;
-# endif
-{
-    ptr_t base = GC_base(p);
-
-    GC_err_printf2("start: 0x%lx, appr. length: %ld", base, GC_size(base));
-}
-
-void (*GC_print_heap_obj) GC_PROTO((ptr_t p)) =
-				GC_default_print_heap_obj_proc;
-
-void GC_print_source_ptr(p)
-ptr_t p;
-{
-    ptr_t base = GC_base(p);
-    if (0 == base) {
-	if (0 == p) {
-	    GC_err_printf0("in register");
-	} else {
-	    GC_err_printf0("in root set");
-	}
-    } else {
-	GC_err_printf0("in object at ");
-	(*GC_print_heap_obj)(base);
-    }
-}
-
-void GC_bl_init()
-{
-    if (!GC_all_interior_pointers) {
-      GC_old_normal_bl = (word *)
-    			 GC_scratch_alloc((word)(sizeof (page_hash_table)));
-      GC_incomplete_normal_bl = (word *)GC_scratch_alloc
-    					((word)(sizeof(page_hash_table)));
-      if (GC_old_normal_bl == 0 || GC_incomplete_normal_bl == 0) {
-        GC_err_printf0("Insufficient memory for black list\n");
-        EXIT();
-      }
-      GC_clear_bl(GC_old_normal_bl);
-      GC_clear_bl(GC_incomplete_normal_bl);
-    }
-    GC_old_stack_bl = (word *)GC_scratch_alloc((word)(sizeof(page_hash_table)));
-    GC_incomplete_stack_bl = (word *)GC_scratch_alloc
-    					((word)(sizeof(page_hash_table)));
-    if (GC_old_stack_bl == 0 || GC_incomplete_stack_bl == 0) {
-        GC_err_printf0("Insufficient memory for black list\n");
-        EXIT();
-    }
-    GC_clear_bl(GC_old_stack_bl);
-    GC_clear_bl(GC_incomplete_stack_bl);
-}
-		
-void GC_clear_bl(doomed)
-word *doomed;
-{
-    BZERO(doomed, sizeof(page_hash_table));
-}
-
-void GC_copy_bl(old, new)
-word *new, *old;
-{
-    BCOPY(old, new, sizeof(page_hash_table));
-}
-
-static word total_stack_black_listed();
-
-/* Signal the completion of a collection.  Turn the incomplete black	*/
-/* lists into new black lists, etc.					*/			 
-void GC_promote_black_lists()
-{
-    word * very_old_normal_bl = GC_old_normal_bl;
-    word * very_old_stack_bl = GC_old_stack_bl;
-    
-    GC_old_normal_bl = GC_incomplete_normal_bl;
-    GC_old_stack_bl = GC_incomplete_stack_bl;
-    if (!GC_all_interior_pointers) {
-      GC_clear_bl(very_old_normal_bl);
-    }
-    GC_clear_bl(very_old_stack_bl);
-    GC_incomplete_normal_bl = very_old_normal_bl;
-    GC_incomplete_stack_bl = very_old_stack_bl;
-    GC_total_stack_black_listed = total_stack_black_listed();
-#   ifdef PRINTSTATS
-  	GC_printf1("%ld bytes in heap blacklisted for interior pointers\n",
-  		   (unsigned long)GC_total_stack_black_listed);
-#   endif
-    if (GC_total_stack_black_listed != 0) {
-        GC_black_list_spacing =
-		HBLKSIZE*(GC_heapsize/GC_total_stack_black_listed);
-    }
-    if (GC_black_list_spacing < 3 * HBLKSIZE) {
-    	GC_black_list_spacing = 3 * HBLKSIZE;
-    }
-    if (GC_black_list_spacing > MAXHINCR * HBLKSIZE) {
-	GC_black_list_spacing = MAXHINCR * HBLKSIZE;
-	/* Makes it easier to allocate really huge blocks, which otherwise */
-	/* may have problems with nonuniform blacklist distributions.	   */
-	/* This way we should always succeed immediately after growing the */ 
-	/* heap.							   */
-    }
-}
-
-void GC_unpromote_black_lists()
-{
-    if (!GC_all_interior_pointers) {
-      GC_copy_bl(GC_old_normal_bl, GC_incomplete_normal_bl);
-    }
-    GC_copy_bl(GC_old_stack_bl, GC_incomplete_stack_bl);
-}
-
-/* P is not a valid pointer reference, but it falls inside	*/
-/* the plausible heap bounds.					*/
-/* Add it to the normal incomplete black list if appropriate.	*/
-#ifdef PRINT_BLACK_LIST
-  void GC_add_to_black_list_normal(p, source)
-  ptr_t source;
-#else
-  void GC_add_to_black_list_normal(p)
-#endif
-word p;
-{
-    if (!(GC_modws_valid_offsets[p & (sizeof(word)-1)])) return;
-    {
-        register int index = PHT_HASH(p);
-        
-        if (HDR(p) == 0 || get_pht_entry_from_index(GC_old_normal_bl, index)) {
-#   	    ifdef PRINT_BLACK_LIST
-		if (!get_pht_entry_from_index(GC_incomplete_normal_bl, index)) {
-	    	  GC_err_printf2(
-			"Black listing (normal) 0x%lx referenced from 0x%lx ",
-	    	        (unsigned long) p, (unsigned long) source);
-		  GC_print_source_ptr(source);
-		  GC_err_puts("\n");
-	    	}
-#           endif
-            set_pht_entry_from_index(GC_incomplete_normal_bl, index);
-        } /* else this is probably just an interior pointer to an allocated */
-          /* object, and isn't worth black listing.			    */
-    }
-}
-
-/* And the same for false pointers from the stack. */
-#ifdef PRINT_BLACK_LIST
-  void GC_add_to_black_list_stack(p, source)
-  ptr_t source;
-#else
-  void GC_add_to_black_list_stack(p)
-#endif
-word p;
-{
-    register int index = PHT_HASH(p);
-        
-    if (HDR(p) == 0 || get_pht_entry_from_index(GC_old_stack_bl, index)) {
-#   	ifdef PRINT_BLACK_LIST
-	    if (!get_pht_entry_from_index(GC_incomplete_stack_bl, index)) {
-	    	  GC_err_printf2(
-			"Black listing (stack) 0x%lx referenced from 0x%lx ",
-	    	        (unsigned long)p, (unsigned long)source);
-		  GC_print_source_ptr(source);
-		  GC_err_puts("\n");
-	    }
-#       endif
-	set_pht_entry_from_index(GC_incomplete_stack_bl, index);
-    }
-}
-
-/*
- * Is the block starting at h of size len bytes black listed?   If so,
- * return the address of the next plausible r such that (r, len) might not
- * be black listed.  (R may not actually be in the heap.  We guarantee only
- * that every smaller value of r after h is also black listed.)
- * If (h,len) is not black listed, return 0.
- * Knows about the structure of the black list hash tables.
- */
-struct hblk * GC_is_black_listed(h, len)
-struct hblk * h;
-word len;
-{
-    register int index = PHT_HASH((word)h);
-    register word i;
-    word nblocks = divHBLKSZ(len);
-
-    if (!GC_all_interior_pointers) {
-      if (get_pht_entry_from_index(GC_old_normal_bl, index)
-          || get_pht_entry_from_index(GC_incomplete_normal_bl, index)) {
-        return(h+1);
-      }
-    }
-    
-    for (i = 0; ; ) {
-        if (GC_old_stack_bl[divWORDSZ(index)] == 0
-            && GC_incomplete_stack_bl[divWORDSZ(index)] == 0) {
-            /* An easy case */
-            i += WORDSZ - modWORDSZ(index);
-        } else {
-          if (get_pht_entry_from_index(GC_old_stack_bl, index)
-              || get_pht_entry_from_index(GC_incomplete_stack_bl, index)) {
-            return(h+i+1);
-          }
-          i++;
-        }
-        if (i >= nblocks) break;
-        index = PHT_HASH((word)(h+i));
-    }
-    return(0);
-}
-
-
-/* Return the number of blacklisted blocks in a given range.	*/
-/* Used only for statistical purposes.				*/
-/* Looks only at the GC_incomplete_stack_bl.			*/
-word GC_number_stack_black_listed(start, endp1)
-struct hblk *start, *endp1;
-{
-    register struct hblk * h;
-    word result = 0;
-    
-    for (h = start; h < endp1; h++) {
-        register int index = PHT_HASH((word)h);
-        
-        if (get_pht_entry_from_index(GC_old_stack_bl, index)) result++;
-    }
-    return(result);
-}
-
-
-/* Return the total number of (stack) black-listed bytes. */
-static word total_stack_black_listed()
-{
-    register unsigned i;
-    word total = 0;
-    
-    for (i = 0; i < GC_n_heap_sects; i++) {
-    	struct hblk * start = (struct hblk *) GC_heap_sects[i].hs_start;
-    	word len = (word) GC_heap_sects[i].hs_bytes;
-    	struct hblk * endp1 = start + len/HBLKSIZE;
-    	
-    	total += GC_number_stack_black_listed(start, endp1);
-    }
-    return(total * HBLKSIZE);
-}
-
diff --git a/boehm-gc/callprocs b/boehm-gc/callprocs
deleted file mode 100755
index a8793f0b728..00000000000
--- a/boehm-gc/callprocs
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-GC_DEBUG=1
-export GC_DEBUG
-$* 2>&1 | awk '{print "0x3e=c\""$0"\""};/^\t##PC##=/ {if ($2 != 0) {print $2"?i"}}' | adb $1 | sed "s/^		>/>/"
diff --git a/boehm-gc/checksums.c b/boehm-gc/checksums.c
deleted file mode 100644
index 57a6ebc2160..00000000000
--- a/boehm-gc/checksums.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1992-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, March 29, 1995 12:51 pm PST */
-# ifdef CHECKSUMS
-
-# include "private/gc_priv.h"
-
-/* This is debugging code intended to verify the results of dirty bit	*/
-/* computations. Works only in a single threaded environment.		*/
-/* We assume that stubborn objects are changed only when they are 	*/
-/* enabled for writing.  (Certain kinds of writing are actually		*/
-/* safe under other conditions.)					*/
-# define NSUMS 10000
-
-# define OFFSET 0x10000
-
-typedef struct {
-	GC_bool new_valid;
-	word old_sum;
-	word new_sum;
-	struct hblk * block;	/* Block to which this refers + OFFSET  */
-				/* to hide it from collector.		*/
-} page_entry;
-
-page_entry GC_sums [NSUMS];
-
-word GC_checksum(h)
-struct hblk *h;
-{
-    register word *p = (word *)h;
-    register word *lim = (word *)(h+1);
-    register word result = 0;
-    
-    while (p < lim) {
-        result += *p++;
-    }
-    return(result | 0x80000000 /* doesn't look like pointer */);
-}
-
-# ifdef STUBBORN_ALLOC
-/* Check whether a stubborn object from the given block appears on	*/
-/* the appropriate free list.						*/
-GC_bool GC_on_free_list(h)
-struct hblk *h;
-{
-    register hdr * hhdr = HDR(h);
-    register int sz = hhdr -> hb_sz;
-    ptr_t p;
-    
-    if (sz > MAXOBJSZ) return(FALSE);
-    for (p = GC_sobjfreelist[sz]; p != 0; p = obj_link(p)) {
-        if (HBLKPTR(p) == h) return(TRUE);
-    }
-    return(FALSE);
-}
-# endif
- 
-int GC_n_dirty_errors;
-int GC_n_changed_errors;
-int GC_n_clean;
-int GC_n_dirty;
-
-void GC_update_check_page(h, index)
-struct hblk *h;
-int index;
-{
-    page_entry *pe = GC_sums + index;
-    register hdr * hhdr = HDR(h);
-    struct hblk *b;
-    
-    if (pe -> block != 0 && pe -> block != h + OFFSET) ABORT("goofed");
-    pe -> old_sum = pe -> new_sum;
-    pe -> new_sum = GC_checksum(h);
-#   if !defined(MSWIN32) && !defined(MSWINCE)
-        if (pe -> new_sum != 0x80000000 && !GC_page_was_ever_dirty(h)) {
-            GC_printf1("GC_page_was_ever_dirty(0x%lx) is wrong\n",
-        	       (unsigned long)h);
-        }
-#   endif
-    if (GC_page_was_dirty(h)) {
-    	GC_n_dirty++;
-    } else {
-    	GC_n_clean++;
-    }
-    b = h;
-    while (IS_FORWARDING_ADDR_OR_NIL(hhdr) && hhdr != 0) {
-	b -= (word)hhdr;
-	hhdr = HDR(b);
-    }
-    if (pe -> new_valid
-	&& hhdr != 0 && hhdr -> hb_descr != 0 /* may contain pointers */
-	&& pe -> old_sum != pe -> new_sum) {
-    	if (!GC_page_was_dirty(h) || !GC_page_was_ever_dirty(h)) {
-    	    /* Set breakpoint here */GC_n_dirty_errors++;
-    	}
-#	ifdef STUBBORN_ALLOC
-    	  if ( hhdr -> hb_map != GC_invalid_map
-    	    && hhdr -> hb_obj_kind == STUBBORN
-    	    && !GC_page_was_changed(h)
-    	    && !GC_on_free_list(h)) {
-    	    /* if GC_on_free_list(h) then reclaim may have touched it	*/
-    	    /* without any allocations taking place.			*/
-    	    /* Set breakpoint here */GC_n_changed_errors++;
-    	  }
-#	endif
-    }
-    pe -> new_valid = TRUE;
-    pe -> block = h + OFFSET;
-}
-
-word GC_bytes_in_used_blocks;
-
-void GC_add_block(h, dummy)
-struct hblk *h;
-word dummy;
-{
-   register hdr * hhdr = HDR(h);
-   register bytes = WORDS_TO_BYTES(hhdr -> hb_sz);
-   
-   bytes += HBLKSIZE-1;
-   bytes &= ~(HBLKSIZE-1);
-   GC_bytes_in_used_blocks += bytes;
-}
-
-void GC_check_blocks()
-{
-    word bytes_in_free_blocks = GC_large_free_bytes;
-    
-    GC_bytes_in_used_blocks = 0;
-    GC_apply_to_all_blocks(GC_add_block, (word)0);
-    GC_printf2("GC_bytes_in_used_blocks = %ld, bytes_in_free_blocks = %ld ",
-    		GC_bytes_in_used_blocks, bytes_in_free_blocks);
-    GC_printf1("GC_heapsize = %ld\n", GC_heapsize);
-    if (GC_bytes_in_used_blocks + bytes_in_free_blocks != GC_heapsize) {
-    	GC_printf0("LOST SOME BLOCKS!!\n");
-    }
-}
-
-/* Should be called immediately after GC_read_dirty and GC_read_changed. */
-void GC_check_dirty()
-{
-    register int index;
-    register unsigned i;
-    register struct hblk *h;
-    register ptr_t start;
-    
-    GC_check_blocks();
-    
-    GC_n_dirty_errors = 0;
-    GC_n_changed_errors = 0;
-    GC_n_clean = 0;
-    GC_n_dirty = 0;
-    
-    index = 0;
-    for (i = 0; i < GC_n_heap_sects; i++) {
-    	start = GC_heap_sects[i].hs_start;
-        for (h = (struct hblk *)start;
-             h < (struct hblk *)(start + GC_heap_sects[i].hs_bytes);
-             h++) {
-             GC_update_check_page(h, index);
-             index++;
-             if (index >= NSUMS) goto out;
-        }
-    }
-out:
-    GC_printf2("Checked %lu clean and %lu dirty pages\n",
-    	      (unsigned long) GC_n_clean, (unsigned long) GC_n_dirty);
-    if (GC_n_dirty_errors > 0) {
-        GC_printf1("Found %lu dirty bit errors\n",
-        	   (unsigned long)GC_n_dirty_errors);
-    }
-    if (GC_n_changed_errors > 0) {
-    	GC_printf1("Found %lu changed bit errors\n",
-        	   (unsigned long)GC_n_changed_errors);
-	GC_printf0("These may be benign (provoked by nonpointer changes)\n");
-#	ifdef THREADS
-	    GC_printf0(
-	    "Also expect 1 per thread currently allocating a stubborn obj.\n");
-#	endif
-    }
-}
-
-# else
-
-extern int GC_quiet;
-	/* ANSI C doesn't allow translation units to be empty.	*/
-	/* So we guarantee this one is nonempty.		*/
-
-# endif /* CHECKSUMS */
diff --git a/boehm-gc/configure b/boehm-gc/configure
deleted file mode 100755
index b2ae9e8401b..00000000000
--- a/boehm-gc/configure
+++ /dev/null
@@ -1,17997 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="gcj_mlc.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-toolexeclibdir
-toolexecdir
-O0_CFLAGS
-addtests
-addlibs
-addincludes
-addobjs
-AM_CPPFLAGS
-CPLUSPLUS_FALSE
-CPLUSPLUS_TRUE
-target_all
-EXTRA_TEST_LIBS
-extra_ldflags_libgc
-POWERPC_DARWIN_FALSE
-POWERPC_DARWIN_TRUE
-THREADLIBS
-THREADCFLAGS
-CXXCPP
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-LIBTOOL
-GC_CFLAGS
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-RANLIB
-AR
-AS
-CCASFLAGS
-CCAS
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-mkinstalldirs
-target_noncanonical
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-multi_basedir
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_multilib
-enable_dependency_tracking
-enable_maintainer_mode
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-with_target_subdir
-with_cross_host
-enable_parallel_mark
-with_ecos
-enable_gc_debug
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CPP
-CPPFLAGS
-CXXCPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-multilib       build many library versions (default)
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-parallel-mark	parallelize marking and free list construction
-  --enable-gc-debug	include full support for pointer backtracing etc.
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-target-subdir=SUBDIR
-                          configuring with a cross compiler
-  --with-cross-host=HOST  configuring with a cross compiler
-  --with-ecos             enable runtime eCos target support
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
-  CXXCPP      C++ preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.64
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_member
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-# This works around the fact that libtool configuration may change LD
-# for this particular configuration, but some shells, instead of
-# keeping the changes in LD private, export them just because LD is
-# exported.
-ORIGINAL_LD_FOR_MULTILIBS=$LD
-
-# Default to --enable-multilib
-# Check whether --enable-multilib was given.
-if test "${enable_multilib+set}" = set; then :
-  enableval=$enable_multilib; case "$enableval" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
- esac
-else
-  multilib=yes
-fi
-
-
-# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
-# See config-ml.in if you want the gory details.
-
-if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
-    multi_basedir="$srcdir/$with_multisrctop../.."
-  else
-    multi_basedir="$srcdir/$with_multisrctop.."
-  fi
-else
-  multi_basedir="$srcdir/.."
-fi
-
-
-# Even if the default multilib is not a cross compilation,
-# it may be that some of the other multilibs are.
-if test $cross_compiling = no && test $multilib = yes \
-   && test "x${with_multisubdir}" != x ; then
-   cross_compiling=maybe
-fi
-
-ac_config_commands="$ac_config_commands default-1"
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-# Get the 'noncanonical' system names.
- case ${build_alias} in
-  "") build_noncanonical=${build} ;;
-  *) build_noncanonical=${build_alias} ;;
-esac
-
- case ${host_alias} in
-  "") host_noncanonical=${build_noncanonical} ;;
-  *) host_noncanonical=${host_alias} ;;
-esac
-
- case ${target_alias} in
-  "") target_noncanonical=${host_noncanonical} ;;
-  *) target_noncanonical=${target_alias} ;;
-esac
-
-
-
-
-# This works around an automake problem.
-mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
-
-
-am__api_version='1.11'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=gc
- VERSION=6.6
-
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-# The autoconf 2.5x version of the no-executables hack.
-
-
-# Yak.  We must force CC and CXX to /not/ be precious variables; otherwise
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS and CXXFLAGS ourselves.
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# FIXME: Cleanup?
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  gcc_no_link=no
-else
-  gcc_no_link=yes
-fi
-if test x$gcc_no_link = xyes; then
-  # Setting cross_compile will disable run tests; it will
-  # also disable AC_CHECK_FILE but that's generally
-  # correct if we can't link.
-  cross_compiling=yes
-  EXEEXT=
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-fi
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-
-
-
-
-# Newer automakes demand CCAS and CCASFLAGS.
-: ${CCAS='$(CC)'}
-: ${CCASFLAGS='$(CFLAGS)'}
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-. ${srcdir}/configure.host
-
-case ${gc_basedir} in
-/* | A-Za-z:/\\*) gc_flagbasedir=${gc_basedir} ;;
-*) gc_flagbasedir='$(top_builddir)/'${gc_basedir} ;;
-esac
-
-gc_cflags="${gc_cflags} -Iinclude -I"'$(top_builddir)'"/./targ-include -I${gc_flagbasedir}/libc/include"
-case "${host}" in
-  *-*-cygwin32*)
-    gc_cflags="${gc_cflags} -I${gc_flagbasedir}/../winsup/include"
-    ;;
-esac
-
-case "${host}" in
-  *-*-mingw*)
-    gc_cflags="${gc_cflags} -DGC_BUILD=1"
-    ;;
-esac
-
-
-GC_CFLAGS=${gc_cflags}
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.7a'
-macro_revision='1.3134'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if test "${lt_cv_ld_force_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012][,.]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if test "${lt_cv_prog_compiler__b+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo(void) {}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 11325 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
-#endif
-
-void fnord () { int i=42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 11431 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
-#endif
-
-void fnord () { int i=42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  compiler_CXX=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-      aix[4-9]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[012]|aix4.[012].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    hardcode_direct_CXX=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        export_dynamic_flag_spec_CXX='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        always_export_symbols_CXX=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          allow_undefined_flag_CXX='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    no_undefined_flag_CXX=' ${wl}-bernotok'
-	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-        # as there is no search path for DLLs.
-        hardcode_libdir_flag_spec_CXX='-L$libdir'
-        export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-        allow_undefined_flag_CXX=unsupported
-        always_export_symbols_CXX=no
-        enable_shared_with_static_runtimes_CXX=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          ld_shlibs_CXX=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-
-  else
-  ld_shlibs_CXX=no
-  fi
-
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
-
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      old_archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      compiler_needs_object_CXX=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        ld_shlibs_CXX=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='${wl}-E'
-	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
-
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=no
-	    case $host_os in
-	      solaris2.[0-5] | solaris2.[0-5].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-    GCC_CXX="$GXX"
-    LD_CXX="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw* | cegcc*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-with_gnu_ld_CXX=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink ||
-   test "$inherit_rpath_CXX" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-
-# Check whether --with-target-subdir was given.
-if test "${with_target_subdir+set}" = set; then :
-  withval=$with_target_subdir;
-fi
-
-
-# Check whether --with-cross-host was given.
-if test "${with_cross_host+set}" = set; then :
-  withval=$with_cross_host;
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread model used by GCC" >&5
-$as_echo_n "checking for thread model used by GCC... " >&6; }
-THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
-if test -z "$THREADS"; then
-   THREADS=no
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THREADS" >&5
-$as_echo "$THREADS" >&6; }
-
-# Check whether --enable-parallel-mark was given.
-if test "${enable_parallel_mark+set}" = set; then :
-  enableval=$enable_parallel_mark; case "$THREADS" in
-      no | none | single)
-	as_fn_error "Parallel mark requires --enable-threads=x spec" "$LINENO" 5
-	;;
-    esac
-
-fi
-
-
-AM_CPPFLAGS="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
-THREADCFLAGS=
-THREADLIBS=
-case "$THREADS" in
- no | none | single)
-    THREADS=none
-    ;;
- posix | pthreads)
-    THREADS=posix
-    THREADLIBS=-lpthread
-    case "$host" in
-     x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux*)
-
-$as_echo "#define GC_LINUX_THREADS 1" >>confdefs.h
-
-
-$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-        if test "${enable_parallel_mark}" = yes; then
-
-$as_echo "#define PARALLEL_MARK 1" >>confdefs.h
-
-	fi
-
-$as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-	;;
-     *-*-linux*)
-	$as_echo "#define GC_LINUX_THREADS 1" >>confdefs.h
-
-	$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-	;;
-     *-*-aix*)
-
-$as_echo "#define GC_AIX_THREADS 1" >>confdefs.h
-
-	$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-	;;
-     *-*-hpux11*)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&5
-$as_echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
-
-$as_echo "#define GC_HPUX_THREADS 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_C_SOURCE 199506L" >>confdefs.h
-
-	if test "${enable_parallel_mark}" = yes; then
-	  $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
-
-	fi
-	$as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-	THREADLIBS="-lpthread -lrt"
-	# HPUX needs REENTRANT for the _r calls.
-
-$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-	;;
-     *-*-hpux10*)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&5
-$as_echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
-	;;
-     *-*-kfreebsd*-gnu)
-       $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
-
-       THREADCFLAGS=-pthread
-       THREADLIBS=-pthread
-       $as_echo "#define _REENTRANT 1" >>confdefs.h
-
-         if test "${enable_parallel_mark}" = yes; then
-         $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
-
-       fi
-       $as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-
-$as_echo "#define USE_COMPILER_TLS 1" >>confdefs.h
-
-       ;;
-     *-*-gnu*)
-
-$as_echo "#define GC_GNU_THREADS 1" >>confdefs.h
-
-	$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-	$as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-	;;
-     *-*-freebsd*)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
-$as_echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-
-$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
-
-	THREADCFLAGS=-pthread
-	THREADLIBS=-pthread
-      	;;
-     *-*-solaris2.8*)
-
-$as_echo "#define GC_SOLARIS_PTHREADS 1" >>confdefs.h
-
-	# Need to use alternate thread library, otherwise gctest hangs
-	# on Solaris 8.
-	multi_os_directory=`$CC -print-multi-os-directory`
-	THREADLIBS="-L/usr/lib/lwp/$multi_os_directory \
-		    -R/usr/lib/lwp/$multi_os_directory -lpthread -lthread -lrt"
-	;;
-     *-*-solaris2*)
-
-$as_echo "#define GC_SOLARIS_PTHREADS 1" >>confdefs.h
-
-	# The alternate thread library was only introduced in Solaris 8 and
-	# became the default in Solaris 9, so no need for the special code
-	# above otherwise.
-	# nanosleep, sched_yield, and sem_* only live in librt before
-	# Solaris 11.
-	THREADLIBS="-lpthread -lrt"
-	;;
-     *-*-irix*)
-
-$as_echo "#define GC_IRIX_THREADS 1" >>confdefs.h
-
-	;;
-     *-*-cygwin*)
-
-$as_echo "#define GC_WIN32_THREADS 1" >>confdefs.h
-
-	;;
-     *-*-darwin*)
-
-$as_echo "#define GC_DARWIN_THREADS 1" >>confdefs.h
-
-	$as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-	if test "${enable_parallel_mark}" = yes; then
-	  $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
-
-	fi
-	;;
-     *-*-osf*)
-
-$as_echo "#define GC_OSF1_THREADS 1" >>confdefs.h
-
-        if test "${enable_parallel_mark}" = yes; then
-	  $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
-
-	  $as_echo "#define THREAD_LOCAL_ALLOC 1" >>confdefs.h
-
-	  # May want to enable it in other cases, too.
-	  # Measurements havent yet been done.
-	fi
-	THREADCFLAGS=-pthread
-	THREADLIBS="-lpthread -lrt"
-	;;
-    esac
-    ;;
- win32)
-    $as_echo "#define GC_WIN32_THREADS 1" >>confdefs.h
-
-            ;;
- aix)
-    THREADS=posix
-    THREADLIBS=-lpthread
-    $as_echo "#define GC_AIX_THREADS 1" >>confdefs.h
-
-    $as_echo "#define _REENTRANT 1" >>confdefs.h
-
-    ;;
- dce | vxworks)
-    as_fn_error "thread package $THREADS not yet supported" "$LINENO" 5
-    ;;
- *)
-    as_fn_error "$THREADS is an unknown thread package" "$LINENO" 5
-    ;;
-esac
-
-
-
-case "$host" in
-   powerpc-*-darwin*)
-      powerpc_darwin=true
-      ;;
-esac
- if test x$powerpc_darwin = xtrue; then
-  POWERPC_DARWIN_TRUE=
-  POWERPC_DARWIN_FALSE='#'
-else
-  POWERPC_DARWIN_TRUE='#'
-  POWERPC_DARWIN_FALSE=
-fi
-
-
-# Darwin needs a few extra special tests to deal with variation in the
-# system headers.
-case "$host" in
-  powerpc*-*-darwin*)
-    ac_fn_c_check_member "$LINENO" "ppc_thread_state_t" "r0" "ac_cv_member_ppc_thread_state_t_r0" "#include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_ppc_thread_state_t_r0" = x""yes; then :
-
-$as_echo "#define HAS_PPC_THREAD_STATE_R0 1" >>confdefs.h
-
-fi
-
-    ac_fn_c_check_member "$LINENO" "ppc_thread_state_t" "__r0" "ac_cv_member_ppc_thread_state_t___r0" "#include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_ppc_thread_state_t___r0" = x""yes; then :
-
-$as_echo "#define HAS_PPC_THREAD_STATE___R0 1" >>confdefs.h
-
-fi
-
-    ac_fn_c_check_member "$LINENO" "ppc_thread_state64_t" "r0" "ac_cv_member_ppc_thread_state64_t_r0" "#include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_ppc_thread_state64_t_r0" = x""yes; then :
-
-$as_echo "#define HAS_PPC_THREAD_STATE64_R0 1" >>confdefs.h
-
-fi
-
-    ac_fn_c_check_member "$LINENO" "ppc_thread_state64_t" "__r0" "ac_cv_member_ppc_thread_state64_t___r0" "#include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_ppc_thread_state64_t___r0" = x""yes; then :
-
-$as_echo "#define HAS_PPC_THREAD_STATE64___R0 1" >>confdefs.h
-
-fi
-
-    ;;
-  i?86*-*-darwin*)
-    ac_fn_c_check_member "$LINENO" "x86_thread_state32_t" "eax" "ac_cv_member_x86_thread_state32_t_eax" "#include <sys/cdefs.h>
-      #include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_x86_thread_state32_t_eax" = x""yes; then :
-
-$as_echo "#define HAS_X86_THREAD_STATE32_EAX 1" >>confdefs.h
-
-fi
-
-    ac_fn_c_check_member "$LINENO" "x86_thread_state32_t" "__eax" "ac_cv_member_x86_thread_state32_t___eax" "#include <sys/cdefs.h>
-      #include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_x86_thread_state32_t___eax" = x""yes; then :
-
-$as_echo "#define HAS_X86_THREAD_STATE32___EAX 1" >>confdefs.h
-
-fi
-
-    ;;
-  x86_64-*-darwin*)
-    ac_fn_c_check_member "$LINENO" "x86_thread_state64_t" "rax" "ac_cv_member_x86_thread_state64_t_rax" "#include <sys/cdefs.h>
-      #include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_x86_thread_state64_t_rax" = x""yes; then :
-
-$as_echo "#define HAS_X86_THREAD_STATE64_RAX 1" >>confdefs.h
-
-fi
-
-    ac_fn_c_check_member "$LINENO" "x86_thread_state64_t" "__rax" "ac_cv_member_x86_thread_state64_t___rax" "#include <sys/cdefs.h>
-      #include <mach/thread_status.h>
-"
-if test "x$ac_cv_member_x86_thread_state64_t___rax" = x""yes; then :
-
-$as_echo "#define HAS_X86_THREAD_STATE64___RAX 1" >>confdefs.h
-
-fi
-
-     ;;
-  *) ;;
-esac
-
-case "$host" in
-  # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64
-  # and unnecessary everywhere.
-  mips-sgi-irix6*) ;;
-  # We never want libdl on darwin. It is a fake libdl that just ends up making
-  # dyld calls anyway
-  *-*-darwin*) ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-if test x$gcc_no_link = xyes; then
-  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl"
-fi
-
-    ;;
-esac
-
-# extra LD Flags which are required for targets
-case "${host}" in
-  *-*-darwin*)
-    extra_ldflags_libgc=-Wl,-single_module
-    ;;
-esac
-
-
-
-
-target_all=libgcjgc.la
-
-
-TARGET_ECOS="no"
-
-# Check whether --with-ecos was given.
-if test "${with_ecos+set}" = set; then :
-  withval=$with_ecos; TARGET_ECOS="$with_ecos"
-
-fi
-
-
-addobjs=
-addlibs=
-addincludes=
-addtests=
-case "$TARGET_ECOS" in
-   no)
-      ;;
-   *)
-
-$as_echo "#define ECOS 1" >>confdefs.h
-
-      AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
-      addobjs="$addobjs ecos.lo"
-      ;;
-esac
-
-if test "${enable_cplusplus}" = yes; then
-      addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
-      addtests="$addtests test_cpp"
-fi
-
- if test "${enable_cplusplus}" = yes; then
-  CPLUSPLUS_TRUE=
-  CPLUSPLUS_FALSE='#'
-else
-  CPLUSPLUS_TRUE='#'
-  CPLUSPLUS_FALSE=
-fi
-
-
-
-
-
-
-# Configuration of shared libraries
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-case "$host" in
- alpha-*-openbsd*)
-     enable_shared=no
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-     ;;
- *)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-     ;;
-esac
-
-# Checks for pthreads functions
-#
-oldLIBS="$LIBS"
-LIBS="$LIBS $THREADLIBS"
-for ac_func in pthread_getattr_np
-do :
-  ac_fn_c_check_func "$LINENO" "pthread_getattr_np" "ac_cv_func_pthread_getattr_np"
-if test "x$ac_cv_func_pthread_getattr_np" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_GETATTR_NP 1
-_ACEOF
-
-fi
-done
-
-for ac_func in pthread_get_stackaddr_np
-do :
-  ac_fn_c_check_func "$LINENO" "pthread_get_stackaddr_np" "ac_cv_func_pthread_get_stackaddr_np"
-if test "x$ac_cv_func_pthread_get_stackaddr_np" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_GET_STACKADDR_NP 1
-_ACEOF
-
-fi
-done
-
-LIBS="$oldLIBS"
-
-# Configuration of machine-dependent code
-#
-# Set NO_EXECUTE_PERMISSION by default because gcj already uses
-# ffi_closure_{alloc,free} which takes care of allocating trampolines
-# in executable memory.
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which machine-dependent code should be used" >&5
-$as_echo_n "checking which machine-dependent code should be used... " >&6; }
-machdep=
-case "$host" in
- alpha*-*-openbsd*)
-    machdep="alpha_mach_dep.lo"
-    if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenBSD/Alpha without dlopen(). Shared library support is disabled" >&5
-$as_echo "$as_me: WARNING: OpenBSD/Alpha without dlopen(). Shared library support is disabled" >&2;}
-    fi
-    ;;
- alpha*-*-linux*)
-    machdep="alpha_mach_dep.lo"
-    ;;
- i?86-*-solaris2.[89] | i?86-*-solaris2.1? | x86_64-*-solaris2.1?)
-
-$as_echo "#define SOLARIS25_PROC_VDB_BUG_FIXED 1" >>confdefs.h
-
-    ;;
- mipstx39-*-elf*)
-    machdep="mips_ultrix_mach_dep.lo"
-
-$as_echo "#define STACKBASE __stackbase" >>confdefs.h
-
-
-$as_echo "#define DATASTART_IS_ETEXT 1" >>confdefs.h
-
-    ;;
- mips-dec-ultrix*)
-    machdep="mips_ultrix_mach-dep.lo"
-    ;;
- mips-nec-sysv*|mips-unknown-sysv*)
-    ;;
- mips*-*-linux*)
-    ;;
- mips-*-*)
-    machdep="mips_sgi_mach_dep.lo"
-    ;;
- sparc-*-netbsd*)
-    machdep="sparc_netbsd_mach_dep.lo"
-    ;;
- sparc-sun-solaris2.3)
-    machdep="sparc_mach_dep.lo"
-
-$as_echo "#define SUNOS53_SHARED_LIB 1" >>confdefs.h
-
-    ;;
- sparc*-sun-solaris2.*)
-    machdep="sparc_mach_dep.lo"
-    ;;
- ia64-*-*)
-    machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
-    ;;
-esac
-
-$as_echo "#define NO_EXECUTE_PERMISSION 1" >>confdefs.h
-
-if test x"$machdep" = x; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $machdep" >&5
-$as_echo "$machdep" >&6; }
-   machdep="mach_dep.lo"
-fi
-addobjs="$addobjs $machdep"
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC optimization should be disabled" >&5
-$as_echo_n "checking whether GCC optimization should be disabled... " >&6; }
-O0_CFLAGS=
-case "$host" in
- *aix*) test "$GCC" = yes && O0_CFLAGS=-O0 ;;
- *) ;;
-esac
-if test x"$O0_CFLAGS" != x; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-$as_echo "#define SILENT 1" >>confdefs.h
-
-
-$as_echo "#define NO_SIGNALS 1" >>confdefs.h
-
-
-$as_echo "#define ALL_INTERIOR_POINTERS 1" >>confdefs.h
-
-
-
-$as_echo "#define JAVA_FINALIZATION 1" >>confdefs.h
-
-
-$as_echo "#define GC_GCJ_SUPPORT 1" >>confdefs.h
-
-
-$as_echo "#define ATOMIC_UNCOLLECTABLE 1" >>confdefs.h
-
-
-# Check whether --enable-gc-debug was given.
-if test "${enable_gc_debug+set}" = set; then :
-  enableval=$enable_gc_debug;  if test "$enable_gc_debug" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Must define GC_DEBUG and use debug alloc. in clients.\"" >&5
-$as_echo "$as_me: WARNING: \"Must define GC_DEBUG and use debug alloc. in clients.\"" >&2;}
-
-$as_echo "#define KEEP_BACK_PTRS 1" >>confdefs.h
-
-
-$as_echo "#define DBG_HDRS_ALL 1" >>confdefs.h
-
-    case $host in
-      ia64-*-linux* )
-
-$as_echo "#define MAKE_BACK_GRAPH 1" >>confdefs.h
-
-      ;;
-      x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
-	$as_echo "#define MAKE_BACK_GRAPH 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Client must not use -fomit-frame-pointer.\"" >&5
-$as_echo "$as_me: WARNING: \"Client must not use -fomit-frame-pointer.\"" >&2;}
-
-$as_echo "#define SAVE_CALL_COUNT 8" >>confdefs.h
-
-      ;;
-    esac
-  fi
-fi
-
-
-if test "${gc_use_mmap}" = "yes"; then
-
-$as_echo "#define USE_MMAP 1" >>confdefs.h
-
-fi
-
-if test -n "$with_cross_host" &&
-   test x"$with_cross_host" != x"no"; then
-  toolexecdir='$(exec_prefix)/$(target_noncanonical)'
-  toolexeclibdir='$(toolexecdir)/lib'
-else
-  toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
-  toolexeclibdir='$(libdir)'
-fi
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
-  .) ;; # Avoid trailing /.
-  *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-esac
-
-
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-ac_config_headers="$ac_config_headers include/gc_config.h include/gc_ext_config.h"
-
-
-ac_config_files="$ac_config_files Makefile include/Makefile testsuite/Makefile threads.mk"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${POWERPC_DARWIN_TRUE}" && test -z "${POWERPC_DARWIN_FALSE}"; then
-  as_fn_error "conditional \"POWERPC_DARWIN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${CPLUSPLUS_TRUE}" && test -z "${CPLUSPLUS_FALSE}"; then
-  as_fn_error "conditional \"CPLUSPLUS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-
-srcdir="$srcdir"
-host="$host"
-target="$target"
-with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
-with_target_subdir="$with_target_subdir"
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-multi_basedir="$multi_basedir"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"
-CXX="$CXX"
-GFORTRAN="$GFORTRAN"
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-reload_flag_CXX \
-compiler_CXX \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_static_CXX \
-lt_cv_prog_compiler_c_o_CXX \
-export_dynamic_flag_spec_CXX \
-whole_archive_flag_spec_CXX \
-compiler_needs_object_CXX \
-with_gnu_ld_CXX \
-allow_undefined_flag_CXX \
-no_undefined_flag_CXX \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
-hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
-exclude_expsyms_CXX \
-include_expsyms_CXX \
-file_list_spec_CXX \
-compiler_lib_search_dirs_CXX \
-predep_objects_CXX \
-postdep_objects_CXX \
-predeps_CXX \
-postdeps_CXX \
-compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
-old_archive_cmds_CXX \
-old_archive_from_new_cmds_CXX \
-old_archive_from_expsyms_cmds_CXX \
-archive_cmds_CXX \
-archive_expsym_cmds_CXX \
-module_cmds_CXX \
-module_expsym_cmds_CXX \
-export_symbols_cmds_CXX \
-prelink_cmds_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "include/gc_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/gc_config.h" ;;
-    "include/gc_ext_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/gc_ext_config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
-    "threads.mk") CONFIG_FILES="$CONFIG_FILES threads.mk" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "default-1":C)
-# Only add multilib support code if we just rebuilt the top-level
-# Makefile.
-case " $CONFIG_FILES " in
- *" Makefile "*)
-   ac_file=Makefile . ${multi_basedir}/config-ml.in
-   ;;
-esac ;;
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags="CXX "
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac
deleted file mode 100644
index 1ccfe37e9d8..00000000000
--- a/boehm-gc/configure.ac
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2006, 2010, 2011 by Red Hat, Inc.
-# All rights reserved.
-# Copyright 2004 Nathanael Nerode
-# 
-# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-# OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-# 
-# Permission is hereby granted to use or copy this program
-# for any purpose,  provided the above notices are retained on all copies.
-# Permission to modify the code and to distribute modified code is granted,
-# provided the above notices are retained, and a notice that the code was
-# modified is included with the above copyright notice.
-#
-# Original author: Tom Tromey
-# Modified by Nathanael Nerode
-
-dnl Process this file with autoconf to produce configure.
-
-AC_PREREQ(2.64)
-AC_INIT
-AC_CONFIG_SRCDIR(gcj_mlc.c)
-# This works around the fact that libtool configuration may change LD
-# for this particular configuration, but some shells, instead of
-# keeping the changes in LD private, export them just because LD is
-# exported.
-ORIGINAL_LD_FOR_MULTILIBS=$LD
-
-AM_ENABLE_MULTILIB(, ..)
-
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-# Get the 'noncanonical' system names.
-ACX_NONCANONICAL_TARGET
-
-# This works around an automake problem.
-mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
-AC_SUBST(mkinstalldirs)
-
-AM_INIT_AUTOMAKE(gc, 6.6, no-define)
-
-# The autoconf 2.5x version of the no-executables hack.
-GCC_NO_EXECUTABLES
-
-# Yak.  We must force CC and CXX to /not/ be precious variables; otherwise
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS and CXXFLAGS ourselves.
-
-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
-m4_define([_AC_ARG_VAR_PRECIOUS],[])
-AC_PROG_CC
-AC_PROG_CXX
-m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-
-AM_PROG_CC_C_O
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CXXFLAGS)
-
-# Newer automakes demand CCAS and CCASFLAGS.
-: ${CCAS='$(CC)'}
-: ${CCASFLAGS='$(CFLAGS)'}
-AC_SUBST(CCAS)
-AC_SUBST(CCASFLAGS)
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-AM_MAINTAINER_MODE
-
-. ${srcdir}/configure.host
-
-case ${gc_basedir} in
-/* | [A-Za-z]:[/\\]*) gc_flagbasedir=${gc_basedir} ;;
-*) gc_flagbasedir='$(top_builddir)/'${gc_basedir} ;;
-esac
-
-gc_cflags="${gc_cflags} -Iinclude -I"'$(top_builddir)'"/./targ-include -I${gc_flagbasedir}/libc/include"
-case "${host}" in
-  *-*-cygwin32*)
-    gc_cflags="${gc_cflags} -I${gc_flagbasedir}/../winsup/include"
-    ;;
-esac
-
-dnl Add for mingw targets GC_BUILD option
-case "${host}" in
-  *-*-mingw*)
-    gc_cflags="${gc_cflags} -DGC_BUILD=1"
-    ;;
-esac
-
-dnl gc_cflags="${gc_cflags} -fno-builtin"
-
-GC_CFLAGS=${gc_cflags}
-AC_SUBST(GC_CFLAGS)
-
-AC_PROG_LIBTOOL
-
-dnl We use these options to decide which functions to include.
-AC_ARG_WITH(target-subdir,
-[  --with-target-subdir=SUBDIR
-                          configuring with a cross compiler])
-AC_ARG_WITH(cross-host,
-[  --with-cross-host=HOST  configuring with a cross compiler])
-
-AC_MSG_CHECKING([for thread model used by GCC])
-THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
-if test -z "$THREADS"; then
-   THREADS=no
-fi
-AC_MSG_RESULT([$THREADS])
-
-AC_ARG_ENABLE(parallel-mark,
-[  --enable-parallel-mark	parallelize marking and free list construction],
-   [case "$THREADS" in
-      no | none | single)
-	AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
-	;;
-    esac]
-)
-
-AM_CPPFLAGS="-I`cd $srcdir && ${PWDCMD-pwd}`/include"
-THREADCFLAGS=
-THREADLIBS=
-case "$THREADS" in
- no | none | single)
-    THREADS=none
-    ;;
- posix | pthreads)
-    THREADS=posix
-    THREADLIBS=-lpthread
-    case "$host" in
-     x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux*)
-	AC_DEFINE(GC_LINUX_THREADS,1,[support for Xavier Leroy's Linux threads])
-	AC_DEFINE(_REENTRANT,1,[Use reentrant code])
-        if test "${enable_parallel_mark}" = yes; then
-	  AC_DEFINE(PARALLEL_MARK,1,[allow the marker to run in multiple threads])
-	fi
-	AC_DEFINE(THREAD_LOCAL_ALLOC,1,[define GC_local_malloc() & GC_local_malloc_atomic()])
-	;;
-     *-*-linux*)
-	AC_DEFINE(GC_LINUX_THREADS,1)
-	AC_DEFINE(_REENTRANT,1)
-	;;
-     *-*-aix*)
-	AC_DEFINE(GC_AIX_THREADS,1,[support AIX threads])
-	AC_DEFINE(_REENTRANT,1)
-	;;
-     *-*-hpux11*)
-	AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.")
-	AC_DEFINE(GC_HPUX_THREADS,1,[enables support for HP/UX 11 pthreads])
-	AC_DEFINE(_POSIX_C_SOURCE,199506L,[POSIX version of C Source])
-	if test "${enable_parallel_mark}" = yes; then
-	  AC_DEFINE(PARALLEL_MARK,1)
-	fi
-	AC_DEFINE(THREAD_LOCAL_ALLOC,1)
-	THREADLIBS="-lpthread -lrt"
-	# HPUX needs REENTRANT for the _r calls.
-	AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
-	;;
-     *-*-hpux10*)
-	AC_MSG_WARN("Only HP-UX 11 POSIX threads are supported.")
-	;;
-     *-*-kfreebsd*-gnu)
-       AC_DEFINE(GC_FREEBSD_THREADS)
-       THREADCFLAGS=-pthread
-       THREADLIBS=-pthread
-       AC_DEFINE(_REENTRANT)
-         if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       AC_DEFINE(USE_COMPILER_TLS, 1,[use tls for boehm])
-       ;;
-     *-*-gnu*)
-	AC_DEFINE(GC_GNU_THREADS,1,[support GNU threads])
-	AC_DEFINE(_REENTRANT)
-	AC_DEFINE(THREAD_LOCAL_ALLOC)
-	;;
-     *-*-freebsd*)
-	AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
-	AC_DEFINE(GC_FREEBSD_THREADS,1,[support FreeBSD threads])
-	THREADCFLAGS=-pthread
-	THREADLIBS=-pthread
-      	;;
-     *-*-solaris2.8*)
-	AC_DEFINE(GC_SOLARIS_PTHREADS,1,[support for Solaris pthreads])
-	# Need to use alternate thread library, otherwise gctest hangs
-	# on Solaris 8.
-	multi_os_directory=`$CC -print-multi-os-directory`
-	THREADLIBS="-L/usr/lib/lwp/$multi_os_directory \
-		    -R/usr/lib/lwp/$multi_os_directory -lpthread -lthread -lrt"
-	;;
-     *-*-solaris2*)
-	AC_DEFINE(GC_SOLARIS_PTHREADS,1,[support for Solaris pthreads])
-	# The alternate thread library was only introduced in Solaris 8 and
-	# became the default in Solaris 9, so no need for the special code
-	# above otherwise.
-	# nanosleep, sched_yield, and sem_* only live in librt before
-	# Solaris 11.
-	THREADLIBS="-lpthread -lrt"
-	;;
-     *-*-irix*)
-	AC_DEFINE(GC_IRIX_THREADS,1,[support for Irix pthreads])
-	;;
-     *-*-cygwin*)
-	AC_DEFINE(GC_WIN32_THREADS,1,[support for win32 threads])
-	;;
-     *-*-darwin*)
-	AC_DEFINE(GC_DARWIN_THREADS,1,[support for Mac OS X pthreads])
-	AC_DEFINE(THREAD_LOCAL_ALLOC,1)
-	if test "${enable_parallel_mark}" = yes; then
-	  AC_DEFINE(PARALLEL_MARK,1)
-	fi
-	;;
-     *-*-osf*)
-	AC_DEFINE(GC_OSF1_THREADS,1,[support for Tru64 pthreads])
-        if test "${enable_parallel_mark}" = yes; then
-	  AC_DEFINE(PARALLEL_MARK,1)
-	  AC_DEFINE(THREAD_LOCAL_ALLOC,1)
-	  # May want to enable it in other cases, too.
-	  # Measurements havent yet been done.
-	fi
-	THREADCFLAGS=-pthread
-	THREADLIBS="-lpthread -lrt"
-	;;
-    esac
-    ;;
- win32)
-    AC_DEFINE(GC_WIN32_THREADS,1)
-    dnl Old wine getenv may not return NULL for missing entry.
-    dnl Define EMPTY_GETENV_RESULTS here to work around the bug.
-    ;;
- aix)
-    THREADS=posix
-    THREADLIBS=-lpthread
-    AC_DEFINE(GC_AIX_THREADS,1)
-    AC_DEFINE(_REENTRANT,1)
-    ;;
- dce | vxworks)
-    AC_MSG_ERROR(thread package $THREADS not yet supported)
-    ;;
- *)
-    AC_MSG_ERROR($THREADS is an unknown thread package)
-    ;;
-esac
-AC_SUBST(THREADCFLAGS)
-AC_SUBST(THREADLIBS)
-
-case "$host" in
-   powerpc-*-darwin*)
-      powerpc_darwin=true
-      ;;
-esac
-AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
-
-# Darwin needs a few extra special tests to deal with variation in the
-# system headers.
-case "$host" in
-  powerpc*-*-darwin*)
-    AC_CHECK_MEMBER(ppc_thread_state_t.r0,
-      AC_DEFINE(HAS_PPC_THREAD_STATE_R0,1,
-	[ppc_thread_state_t has field r0]),,
-      [#include <mach/thread_status.h>])
-    AC_CHECK_MEMBER(ppc_thread_state_t.__r0,
-      AC_DEFINE(HAS_PPC_THREAD_STATE___R0,1,dnl
-	[ppc_thread_state_t has field __r0]),,
-      [#include <mach/thread_status.h>])
-    AC_CHECK_MEMBER(ppc_thread_state64_t.r0,
-      AC_DEFINE(HAS_PPC_THREAD_STATE64_R0,1,dnl
-	[ppc_thread_state64_t has field r0]),,
-      [#include <mach/thread_status.h>])
-    AC_CHECK_MEMBER(ppc_thread_state64_t.__r0,
-      AC_DEFINE(HAS_PPC_THREAD_STATE64___R0,1,dnl
-	[ppc_thread_state64_t has field __r0]),,
-      [#include <mach/thread_status.h>])
-    ;;
-  i?86*-*-darwin*)
-    AC_CHECK_MEMBER(x86_thread_state32_t.eax,
-      AC_DEFINE(HAS_X86_THREAD_STATE32_EAX,1,dnl
-	[x86_thread_state32_t has field eax]),,
-      [#include <sys/cdefs.h>
-      #include <mach/thread_status.h>])
-    AC_CHECK_MEMBER(x86_thread_state32_t.__eax,
-      AC_DEFINE(HAS_X86_THREAD_STATE32___EAX,1,dnl
-	[x86_thread_state32_t has field __eax]),,
-      [#include <sys/cdefs.h>
-      #include <mach/thread_status.h>])
-    ;;
-  x86_64-*-darwin*)
-    AC_CHECK_MEMBER(x86_thread_state64_t.rax,
-      AC_DEFINE(HAS_X86_THREAD_STATE64_RAX,1,dnl
-	[x86_thread_state64_t has field rax]),,
-      [#include <sys/cdefs.h>
-      #include <mach/thread_status.h>])
-    AC_CHECK_MEMBER(x86_thread_state64_t.__rax,
-      AC_DEFINE(HAS_X86_THREAD_STATE64___RAX,1,dnl
-	[x86_thread_state64_t has field __rax]),,
-      [#include <sys/cdefs.h>
-      #include <mach/thread_status.h>])
-     ;;
-  *) ;;
-esac
-
-case "$host" in
-  # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64
-  # and unnecessary everywhere.
-  mips-sgi-irix6*) ;;
-  # We never want libdl on darwin. It is a fake libdl that just ends up making
-  # dyld calls anyway
-  *-*-darwin*) ;;
-  *)
-    AC_CHECK_LIB(dl, dlopen, EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl")
-    ;;
-esac
-
-# extra LD Flags which are required for targets
-case "${host}" in
-  *-*-darwin*)
-    extra_ldflags_libgc=-Wl,-single_module
-    ;;
-esac
-AC_SUBST(extra_ldflags_libgc)
-
-AC_SUBST(EXTRA_TEST_LIBS)
-
-target_all=libgcjgc.la
-AC_SUBST(target_all)
-
-dnl If the target is an eCos system, use the appropriate eCos
-dnl I/O routines.
-dnl FIXME: this should not be a local option but a global target
-dnl system; at present there is no eCos target.
-TARGET_ECOS="no"
-AC_ARG_WITH(ecos,
-[  --with-ecos             enable runtime eCos target support],
-TARGET_ECOS="$with_ecos"
-)
-
-addobjs=
-addlibs=
-addincludes=
-addtests=
-case "$TARGET_ECOS" in
-   no)
-      ;;
-   *)
-      AC_DEFINE(ECOS,1,[Target is ECOS])
-      AM_CPPFLAGS="${AM_CPPFLAGS} -I${TARGET_ECOS}/include"
-      addobjs="$addobjs ecos.lo"
-      ;;
-esac
-
-if test "${enable_cplusplus}" = yes; then
-      addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
-      addtests="$addtests test_cpp"
-fi
-
-AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
-
-AC_SUBST(CXX)
-
-AC_SUBST(AM_CPPFLAGS)
-
-# Configuration of shared libraries
-#
-AC_MSG_CHECKING(whether to build shared libraries)
-AC_ENABLE_SHARED
-
-case "$host" in
- alpha-*-openbsd*)
-     enable_shared=no
-     AC_MSG_RESULT(no)
-     ;;
- *)
-     AC_MSG_RESULT(yes)
-     ;;
-esac
-
-# Checks for pthreads functions
-#
-oldLIBS="$LIBS"
-LIBS="$LIBS $THREADLIBS"
-AC_CHECK_FUNCS([pthread_getattr_np])
-AC_CHECK_FUNCS([pthread_get_stackaddr_np])
-LIBS="$oldLIBS"
-
-# Configuration of machine-dependent code
-#
-# Set NO_EXECUTE_PERMISSION by default because gcj already uses
-# ffi_closure_{alloc,free} which takes care of allocating trampolines
-# in executable memory.
-#
-AC_MSG_CHECKING(which machine-dependent code should be used)
-machdep=
-case "$host" in
- alpha*-*-openbsd*)
-    machdep="alpha_mach_dep.lo"
-    if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
-       AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
-    fi
-    ;;
- alpha*-*-linux*)
-    machdep="alpha_mach_dep.lo"
-    ;;
- i?86-*-solaris2.[[89]] | i?86-*-solaris2.1? | x86_64-*-solaris2.1?)
-    AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED,1,[PROC_VDB in Solaris 2.5 gives wrong values for dirty bits])
-    ;;
- mipstx39-*-elf*)
-    machdep="mips_ultrix_mach_dep.lo"
-    AC_DEFINE(STACKBASE, __stackbase,[No description])
-    AC_DEFINE(DATASTART_IS_ETEXT,1,[No description])
-    ;;
- mips-dec-ultrix*)
-    machdep="mips_ultrix_mach-dep.lo"
-    ;;
- mips-nec-sysv*|mips-unknown-sysv*)
-    ;;
- mips*-*-linux*)
-    ;;
- mips-*-*)
-    machdep="mips_sgi_mach_dep.lo"
-    ;;
- sparc-*-netbsd*)
-    machdep="sparc_netbsd_mach_dep.lo"
-    ;;
- sparc-sun-solaris2.3)
-    machdep="sparc_mach_dep.lo"
-    AC_DEFINE(SUNOS53_SHARED_LIB,1,[Avoid Solaris 5.3 dynamic library bug])
-    ;;
- sparc*-sun-solaris2.*)
-    machdep="sparc_mach_dep.lo"
-    ;;
- ia64-*-*)
-    machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
-    ;;
-esac
-AC_DEFINE(NO_EXECUTE_PERMISSION,1,[cause some or all of the heap to not have execute permission])
-if test x"$machdep" = x; then
-AC_MSG_RESULT($machdep)
-   machdep="mach_dep.lo"
-fi
-addobjs="$addobjs $machdep"
-AC_SUBST(addobjs)
-AC_SUBST(addincludes)
-AC_SUBST(addlibs)
-AC_SUBST(addtests)
-
-dnl As of 4.13a2, the collector will not properly work on Solaris when
-dnl built with gcc and -O.  So we remove -O in the appropriate case.
-dnl Not needed anymore on Solaris.
-AC_MSG_CHECKING([whether GCC optimization should be disabled])
-O0_CFLAGS=
-case "$host" in
- *aix*) test "$GCC" = yes && O0_CFLAGS=-O0 ;;
- *) ;;
-esac
-if test x"$O0_CFLAGS" != x; then
-   AC_MSG_RESULT(yes)
-else
-   AC_MSG_RESULT(no)
-fi
-AC_SUBST([O0_CFLAGS])
-
-dnl Include defines that have become de facto standard.
-dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
-AC_DEFINE(SILENT,1,[disables statistics printing])
-AC_DEFINE(NO_SIGNALS,1,[does not disable signals])
-AC_DEFINE(ALL_INTERIOR_POINTERS,1,[allows all pointers to the interior of objects to be recognized])
-
-dnl By default, make the library as general as possible.
-AC_DEFINE(JAVA_FINALIZATION,1,[make it somewhat safer to finalize objects out of order])
-AC_DEFINE(GC_GCJ_SUPPORT,1,[include support for gcj])
-AC_DEFINE(ATOMIC_UNCOLLECTABLE,1,[include code for GC_malloc_atomic_uncollectable])
-
-AC_ARG_ENABLE(gc-debug,
-[  --enable-gc-debug	include full support for pointer backtracing etc.],
-[ if test "$enable_gc_debug" = "yes"; then
-    AC_MSG_WARN("Must define GC_DEBUG and use debug alloc. in clients.")
-    AC_DEFINE(KEEP_BACK_PTRS,1,[Add code to save back pointers])
-    AC_DEFINE(DBG_HDRS_ALL,1,[Make sure that all objects have debug headers])
-    case $host in
-      ia64-*-linux* )
-	AC_DEFINE(MAKE_BACK_GRAPH,1,[Enable GC_PRINT_BACK_HEIGHT environment variable])
-      ;;
-      x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
-	AC_DEFINE(MAKE_BACK_GRAPH,1)
-	AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
-	AC_DEFINE(SAVE_CALL_COUNT, 8, [number of call frames saved with objects allocated through the debugging interface])
-      ;;
-    esac 
-  fi])
-
-if test "${gc_use_mmap}" = "yes"; then
-  AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory])
-fi
-
-if test -n "$with_cross_host" &&
-   test x"$with_cross_host" != x"no"; then
-  toolexecdir='$(exec_prefix)/$(target_noncanonical)'
-  toolexeclibdir='$(toolexecdir)/lib'
-else
-  toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
-  toolexeclibdir='$(libdir)'
-fi
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
-  .) ;; # Avoid trailing /.
-  *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-esac
-AC_SUBST(toolexecdir)
-AC_SUBST(toolexeclibdir)
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-AC_CONFIG_HEADERS([include/gc_config.h include/gc_ext_config.h])
-
-AC_CONFIG_FILES(Makefile include/Makefile testsuite/Makefile threads.mk)
-AC_OUTPUT
diff --git a/boehm-gc/configure.host b/boehm-gc/configure.host
deleted file mode 100644
index 229a03877b9..00000000000
--- a/boehm-gc/configure.host
+++ /dev/null
@@ -1,70 +0,0 @@
-# configure.host
-
-# This shell script handles all host based configuration for the garbage
-# collector.
-# It sets various shell variables based on the the host and the
-# configuration options.  You can modify this shell script without
-# needing to rerun autoconf.
-
-# This shell script should be invoked as
-#   . configure.host
-# If it encounters an error, it will exit with a message.
-
-# It uses the following shell variables:
-#   host		The configuration host
-#   host_cpu		The configuration host CPU
-#   target_optspace	--enable-target-optspace ("yes", "no", "")
-#   GCC                 should be "yes" if using gcc
-
-# It sets the following shell variables:
-#   gc_cflags	Special CFLAGS to use when building
-#   gc_use_mmap  Set to "yes" on platforms where mmap should be used instead
-#		 of sbrk. This will define USE_MMAP.
-
-gc_cflags=""
-gc_use_mmap=
-
-# We should set -fexceptions if we are using gcc and might be used
-# inside something like gcj.  This is the zeroth approximation:
-if test :"$GCC": = :yes: ; then
-    gc_cflags="${gc_cflags} -fexceptions"
-else
-    case "$host" in 
-        hppa*-*-hpux* )
-	if test :$GCC: != :"yes": ; then
-            gc_cflags="${gc_flags} +ESdbgasm"
-	fi
-        # :TODO: actaully we should check using Autoconf if
-        #     the compiler supports this option.
-        ;;
-    esac
-fi
-
-case "${host}" in
-  *-linux*|*-kfreebsd-gnu*|*-gnu*)
-    gc_use_mmap=yes
-    ;;
-esac
-
-case "${target_optspace}:${host}" in
-  yes:*)
-    gc_cflags="${gc_cflags} -Os"
-    ;;
-  :m32r-* | :d10v-* | :d30v-*)
-    gc_cflags="${gc_cflags} -Os"
-    ;;
-  no:* | :*)
-    # Nothing.
-    ;;
-esac
-
-# Set any host dependent compiler flags.
-# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
-
-case "${host}" in
-  mips-tx39-*|mipstx39-unknown-*)
-	gc_cflags="${gc_cflags} -G 0"
-	;;
-  *)
-	;;
-esac
diff --git a/boehm-gc/cord/cordbscs.c b/boehm-gc/cord/cordbscs.c
deleted file mode 100644
index d83f4067de7..00000000000
--- a/boehm-gc/cord/cordbscs.c
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Author: Hans-J. Boehm (boehm@parc.xerox.com)
- */
-/* Boehm, October 3, 1994 5:19 pm PDT */
-# include "gc.h"
-# include "cord.h"
-# include <stdlib.h>
-# include <stdio.h>
-# include <string.h>
-
-/* An implementation of the cord primitives.  These are the only 	*/
-/* Functions that understand the representation.  We perform only	*/
-/* minimal checks on arguments to these functions.  Out of bounds	*/
-/* arguments to the iteration functions may result in client functions	*/
-/* invoked on garbage data.  In most cases, client functions should be	*/
-/* programmed defensively enough that this does not result in memory	*/
-/* smashes.								*/ 
-
-typedef void (* oom_fn)(void);
-
-oom_fn CORD_oom_fn = (oom_fn) 0;
-
-# define OUT_OF_MEMORY {  if (CORD_oom_fn != (oom_fn) 0) (*CORD_oom_fn)(); \
-			  ABORT("Out of memory\n"); }
-# define ABORT(msg) { fprintf(stderr, "%s\n", msg); abort(); }
-
-typedef unsigned long word;
-
-typedef union {
-    struct Concatenation {
-    	char null;
-	char header;
-	char depth;	/* concatenation nesting depth. */
-	unsigned char left_len;
-			/* Length of left child if it is sufficiently	*/
-			/* short; 0 otherwise.				*/
-#	    define MAX_LEFT_LEN 255
-	word len;
-	CORD left;	/* length(left) > 0	*/
-	CORD right;	/* length(right) > 0	*/
-    } concatenation;
-    struct Function {
-	char null;
-	char header;
-	char depth;	/* always 0	*/
-	char left_len;	/* always 0	*/
-	word len;
-	CORD_fn fn;
-	void * client_data;
-    } function;
-    struct Generic {
-    	char null;
-	char header;
-	char depth;
-	char left_len;
-	word len;
-    } generic;
-    char string[1];
-} CordRep;
-
-# define CONCAT_HDR 1
-	
-# define FN_HDR 4
-# define SUBSTR_HDR 6
-	/* Substring nodes are a special case of function nodes.  	*/
-	/* The client_data field is known to point to a substr_args	*/
-	/* structure, and the function is either CORD_apply_access_fn 	*/
-	/* or CORD_index_access_fn.					*/
-
-/* The following may be applied only to function and concatenation nodes: */
-#define IS_CONCATENATION(s)  (((CordRep *)s)->generic.header == CONCAT_HDR)
-
-#define IS_FUNCTION(s)  ((((CordRep *)s)->generic.header & FN_HDR) != 0)
-
-#define IS_SUBSTR(s) (((CordRep *)s)->generic.header == SUBSTR_HDR)
-
-#define LEN(s) (((CordRep *)s) -> generic.len)
-#define DEPTH(s) (((CordRep *)s) -> generic.depth)
-#define GEN_LEN(s) (CORD_IS_STRING(s) ? strlen(s) : LEN(s))
-
-#define LEFT_LEN(c) ((c) -> left_len != 0? \
-				(c) -> left_len \
-				: (CORD_IS_STRING((c) -> left) ? \
-					(c) -> len - GEN_LEN((c) -> right) \
-					: LEN((c) -> left)))
-
-#define SHORT_LIMIT (sizeof(CordRep) - 1)
-	/* Cords shorter than this are C strings */
-
-
-/* Dump the internal representation of x to stdout, with initial 	*/
-/* indentation level n.							*/
-void CORD_dump_inner(CORD x, unsigned n)
-{
-    register size_t i;
-    
-    for (i = 0; i < (size_t)n; i++) {
-        fputs("  ", stdout);
-    }
-    if (x == 0) {
-      	fputs("NIL\n", stdout);
-    } else if (CORD_IS_STRING(x)) {
-        for (i = 0; i <= SHORT_LIMIT; i++) {
-            if (x[i] == '\0') break;
-            putchar(x[i]);
-        }
-        if (x[i] != '\0') fputs("...", stdout);
-        putchar('\n');
-    } else if (IS_CONCATENATION(x)) {
-        register struct Concatenation * conc =
-        			&(((CordRep *)x) -> concatenation);
-        printf("Concatenation: %p (len: %d, depth: %d)\n",
-               x, (int)(conc -> len), (int)(conc -> depth));
-        CORD_dump_inner(conc -> left, n+1);
-        CORD_dump_inner(conc -> right, n+1);
-    } else /* function */{
-        register struct Function * func =
-        			&(((CordRep *)x) -> function);
-        if (IS_SUBSTR(x)) printf("(Substring) ");
-        printf("Function: %p (len: %d): ", x, (int)(func -> len));
-        for (i = 0; i < 20 && i < func -> len; i++) {
-            putchar((*(func -> fn))(i, func -> client_data));
-        }
-        if (i < func -> len) fputs("...", stdout);
-        putchar('\n');
-    }
-}
-
-/* Dump the internal representation of x to stdout	*/
-void CORD_dump(CORD x)
-{
-    CORD_dump_inner(x, 0);
-    fflush(stdout);
-}
-
-CORD CORD_cat_char_star(CORD x, const char * y, size_t leny)
-{
-    register size_t result_len;
-    register size_t lenx;
-    register int depth;
-    
-    if (x == CORD_EMPTY) return(y);
-    if (leny == 0) return(x);
-    if (CORD_IS_STRING(x)) {
-        lenx = strlen(x);
-        result_len = lenx + leny;
-        if (result_len <= SHORT_LIMIT) {
-            register char * result = GC_MALLOC_ATOMIC(result_len+1);
-        
-            if (result == 0) OUT_OF_MEMORY;
-            memcpy(result, x, lenx);
-            memcpy(result + lenx, y, leny);
-            result[result_len] = '\0';
-            return((CORD) result);
-        } else {
-            depth = 1;
-        }
-    } else {
-    	register CORD right;
-    	register CORD left;
-    	register char * new_right;
-    	register size_t right_len;
-    	
-    	lenx = LEN(x);
-    	
-        if (leny <= SHORT_LIMIT/2
-    	    && IS_CONCATENATION(x)
-            && CORD_IS_STRING(right = ((CordRep *)x) -> concatenation.right)) {
-            /* Merge y into right part of x. */
-            if (!CORD_IS_STRING(left = ((CordRep *)x) -> concatenation.left)) {
-            	right_len = lenx - LEN(left);
-            } else if (((CordRep *)x) -> concatenation.left_len != 0) {
-                right_len = lenx - ((CordRep *)x) -> concatenation.left_len;
-            } else {
-            	right_len = strlen(right);
-            }
-            result_len = right_len + leny;  /* length of new_right */
-            if (result_len <= SHORT_LIMIT) {
-            	new_right = GC_MALLOC_ATOMIC(result_len + 1);
-            	memcpy(new_right, right, right_len);
-            	memcpy(new_right + right_len, y, leny);
-            	new_right[result_len] = '\0';
-            	y = new_right;
-            	leny = result_len;
-            	x = left;
-            	lenx -= right_len;
-            	/* Now fall through to concatenate the two pieces: */
-            }
-            if (CORD_IS_STRING(x)) {
-                depth = 1;
-            } else {
-                depth = DEPTH(x) + 1;
-            }
-        } else {
-            depth = DEPTH(x) + 1;
-        }
-        result_len = lenx + leny;
-    }
-    {
-      /* The general case; lenx, result_len is known: */
-    	register struct Concatenation * result;
-    	
-    	result = GC_NEW(struct Concatenation);
-    	if (result == 0) OUT_OF_MEMORY;
-    	result->header = CONCAT_HDR;
-    	result->depth = depth;
-    	if (lenx <= MAX_LEFT_LEN) result->left_len = lenx;
-    	result->len = result_len;
-    	result->left = x;
-    	result->right = y;
-    	if (depth >= MAX_DEPTH) {
-    	    return(CORD_balance((CORD)result));
-    	} else {
-    	    return((CORD) result);
-    	}
-    }
-}
-
-
-CORD CORD_cat(CORD x, CORD y)
-{
-    register size_t result_len;
-    register int depth;
-    register size_t lenx;
-    
-    if (x == CORD_EMPTY) return(y);
-    if (y == CORD_EMPTY) return(x);
-    if (CORD_IS_STRING(y)) {
-        return(CORD_cat_char_star(x, y, strlen(y)));
-    } else if (CORD_IS_STRING(x)) {
-        lenx = strlen(x);
-        depth = DEPTH(y) + 1;
-    } else {
-        register int depthy = DEPTH(y);
-        
-        lenx = LEN(x);
-        depth = DEPTH(x) + 1;
-        if (depthy >= depth) depth = depthy + 1;
-    }
-    result_len = lenx + LEN(y);
-    {
-    	register struct Concatenation * result;
-    	
-    	result = GC_NEW(struct Concatenation);
-    	if (result == 0) OUT_OF_MEMORY;
-    	result->header = CONCAT_HDR;
-    	result->depth = depth;
-    	if (lenx <= MAX_LEFT_LEN) result->left_len = lenx;
-    	result->len = result_len;
-    	result->left = x;
-    	result->right = y;
-    	if (depth >= MAX_DEPTH) {
-    	    return(CORD_balance((CORD)result));
-    	} else {
-    	    return((CORD) result);
-    	}
-    }
-}
-
-
-
-CORD CORD_from_fn(CORD_fn fn, void * client_data, size_t len)
-{
-    if (len <= 0) return(0);
-    if (len <= SHORT_LIMIT) {
-        register char * result;
-        register size_t i;
-        char buf[SHORT_LIMIT+1];
-        register char c;
-        
-        for (i = 0; i < len; i++) {
-            c = (*fn)(i, client_data);
-            if (c == '\0') goto gen_case;
-            buf[i] = c;
-        }
-        buf[i] = '\0';
-        result = GC_MALLOC_ATOMIC(len+1);
-        if (result == 0) OUT_OF_MEMORY;
-        strcpy(result, buf);
-        result[len] = '\0';
-        return((CORD) result);
-    }
-  gen_case:
-    {
-    	register struct Function * result;
-    	
-    	result = GC_NEW(struct Function);
-    	if (result == 0) OUT_OF_MEMORY;
-    	result->header = FN_HDR;
-    	/* depth is already 0 */
-    	result->len = len;
-    	result->fn = fn;
-    	result->client_data = client_data;
-    	return((CORD) result);
-    }
-}
-
-size_t CORD_len(CORD x)
-{
-    if (x == 0) {
-     	return(0);
-    } else {
-	return(GEN_LEN(x));
-    }
-}
-
-struct substr_args {
-    CordRep * sa_cord;
-    size_t sa_index;
-};
-
-char CORD_index_access_fn(size_t i, void * client_data)
-{
-    register struct substr_args *descr = (struct substr_args *)client_data;
-    
-    return(((char *)(descr->sa_cord))[i + descr->sa_index]);
-}
-
-char CORD_apply_access_fn(size_t i, void * client_data)
-{
-    register struct substr_args *descr = (struct substr_args *)client_data;
-    register struct Function * fn_cord = &(descr->sa_cord->function);
-    
-    return((*(fn_cord->fn))(i + descr->sa_index, fn_cord->client_data));
-}
-
-/* A version of CORD_substr that simply returns a function node, thus	*/
-/* postponing its work.	The fourth argument is a function that may	*/
-/* be used for efficient access to the ith character.			*/
-/* Assumes i >= 0 and i + n < length(x).				*/
-CORD CORD_substr_closure(CORD x, size_t i, size_t n, CORD_fn f)
-{
-    register struct substr_args * sa = GC_NEW(struct substr_args);
-    CORD result;
-    
-    if (sa == 0) OUT_OF_MEMORY;
-    sa->sa_cord = (CordRep *)x;
-    sa->sa_index = i;
-    result = CORD_from_fn(f, (void *)sa, n);
-    ((CordRep *)result) -> function.header = SUBSTR_HDR;
-    return (result);
-}
-
-# define SUBSTR_LIMIT (10 * SHORT_LIMIT)
-	/* Substrings of function nodes and flat strings shorter than 	*/
-	/* this are flat strings.  Othewise we use a functional 	*/
-	/* representation, which is significantly slower to access.	*/
-
-/* A version of CORD_substr that assumes i >= 0, n > 0, and i + n < length(x).*/
-CORD CORD_substr_checked(CORD x, size_t i, size_t n)
-{
-    if (CORD_IS_STRING(x)) {
-        if (n > SUBSTR_LIMIT) {
-            return(CORD_substr_closure(x, i, n, CORD_index_access_fn));
-        } else {
-            register char * result = GC_MALLOC_ATOMIC(n+1);
-            
-            if (result == 0) OUT_OF_MEMORY;
-            strncpy(result, x+i, n);
-            result[n] = '\0';
-            return(result);
-        }
-    } else if (IS_CONCATENATION(x)) {
-    	register struct Concatenation * conc
-    			= &(((CordRep *)x) -> concatenation);
-    	register size_t left_len;
-    	register size_t right_len;
-    	
-    	left_len = LEFT_LEN(conc);
-    	right_len = conc -> len - left_len;
-    	if (i >= left_len) {
-    	    if (n == right_len) return(conc -> right);
-    	    return(CORD_substr_checked(conc -> right, i - left_len, n));
-    	} else if (i+n <= left_len) {
-    	    if (n == left_len) return(conc -> left);
-    	    return(CORD_substr_checked(conc -> left, i, n));
-    	} else {
-    	    /* Need at least one character from each side. */
-    	    register CORD left_part;
-    	    register CORD right_part;
-    	    register size_t left_part_len = left_len - i;
-     	
-    	    if (i == 0) {
-    	        left_part = conc -> left;
-    	    } else {
-    	        left_part = CORD_substr_checked(conc -> left, i, left_part_len);
-    	    }
-    	    if (i + n == right_len + left_len) {
-    	         right_part = conc -> right;
-    	    } else {
-    	         right_part = CORD_substr_checked(conc -> right, 0,
-    	    				          n - left_part_len);
-    	    }
-    	    return(CORD_cat(left_part, right_part));
-    	}
-    } else /* function */ {
-        if (n > SUBSTR_LIMIT) {
-            if (IS_SUBSTR(x)) {
-            	/* Avoid nesting substring nodes.	*/
-            	register struct Function * f = &(((CordRep *)x) -> function);
-            	register struct substr_args *descr =
-            			(struct substr_args *)(f -> client_data);
-            	
-            	return(CORD_substr_closure((CORD)descr->sa_cord,
-            				   i + descr->sa_index,
-            				   n, f -> fn));
-            } else {
-                return(CORD_substr_closure(x, i, n, CORD_apply_access_fn));
-            }
-        } else {
-            char * result;
-            register struct Function * f = &(((CordRep *)x) -> function);
-            char buf[SUBSTR_LIMIT+1];
-            register char * p = buf;
-            register char c;
-            register int j;
-            register int lim = i + n;
-            
-            for (j = i; j < lim; j++) {
-            	c = (*(f -> fn))(j, f -> client_data);
-            	if (c == '\0') {
-            	    return(CORD_substr_closure(x, i, n, CORD_apply_access_fn));
-            	}
-            	*p++ = c;
-            }
-            *p = '\0';
-            result = GC_MALLOC_ATOMIC(n+1);
-            if (result == 0) OUT_OF_MEMORY;
-            strcpy(result, buf);
-            return(result);
-        }
-    }
-}
-
-CORD CORD_substr(CORD x, size_t i, size_t n)
-{
-    register size_t len = CORD_len(x);
-    
-    if (i >= len || n <= 0) return(0);
-    	/* n < 0 is impossible in a correct C implementation, but	*/
-    	/* quite possible  under SunOS 4.X.				*/
-    if (i + n > len) n = len - i;
-#   ifndef __STDC__
-      if (i < 0) ABORT("CORD_substr: second arg. negative");
-    	/* Possible only if both client and C implementation are buggy.	*/
-    	/* But empirically this happens frequently.			*/
-#   endif
-    return(CORD_substr_checked(x, i, n));
-}
-
-/* See cord.h for definition.  We assume i is in range.	*/
-int CORD_iter5(CORD x, size_t i, CORD_iter_fn f1,
-			 CORD_batched_iter_fn f2, void * client_data)
-{
-    if (x == 0) return(0);
-    if (CORD_IS_STRING(x)) {
-    	register const char *p = x+i;
-    	
-    	if (*p == '\0') ABORT("2nd arg to CORD_iter5 too big");
-        if (f2 != CORD_NO_FN) {
-            return((*f2)(p, client_data));
-        } else {
-	    while (*p) {
-                if ((*f1)(*p, client_data)) return(1);
-                p++;
-	    }
-	    return(0);
-        }
-    } else if (IS_CONCATENATION(x)) {
-    	register struct Concatenation * conc
-    			= &(((CordRep *)x) -> concatenation);
-    	
-    	
-    	if (i > 0) {
-    	    register size_t left_len = LEFT_LEN(conc);
-    	    
-    	    if (i >= left_len) {
-    	        return(CORD_iter5(conc -> right, i - left_len, f1, f2,
-    	        		  client_data));
-    	    }
-    	}
-    	if (CORD_iter5(conc -> left, i, f1, f2, client_data)) {
-    	    return(1);
-    	}
-    	return(CORD_iter5(conc -> right, 0, f1, f2, client_data));
-    } else /* function */ {
-        register struct Function * f = &(((CordRep *)x) -> function);
-        register size_t j;
-        register size_t lim = f -> len;
-        
-        for (j = i; j < lim; j++) {
-            if ((*f1)((*(f -> fn))(j, f -> client_data), client_data)) {
-                return(1);
-            }
-        }
-        return(0);
-    }
-}
-			
-#undef CORD_iter
-int CORD_iter(CORD x, CORD_iter_fn f1, void * client_data)
-{
-    return(CORD_iter5(x, 0, f1, CORD_NO_FN, client_data));
-}
-
-int CORD_riter4(CORD x, size_t i, CORD_iter_fn f1, void * client_data)
-{
-    if (x == 0) return(0);
-    if (CORD_IS_STRING(x)) {
-	register const char *p = x + i;
-	register char c;
-               
-	for(;;) {
-	    c = *p;
-	    if (c == '\0') ABORT("2nd arg to CORD_riter4 too big");
-            if ((*f1)(c, client_data)) return(1);
-	    if (p == x) break;
-            p--;
-	}
-	return(0);
-    } else if (IS_CONCATENATION(x)) {
-    	register struct Concatenation * conc
-    			= &(((CordRep *)x) -> concatenation);
-    	register CORD left_part = conc -> left;
-    	register size_t left_len;
-    	
-    	left_len = LEFT_LEN(conc);
-    	if (i >= left_len) {
-    	    if (CORD_riter4(conc -> right, i - left_len, f1, client_data)) {
-    	    	return(1);
-    	    }
-    	    return(CORD_riter4(left_part, left_len - 1, f1, client_data));
-    	} else {
-    	    return(CORD_riter4(left_part, i, f1, client_data));
-    	}
-    } else /* function */ {
-        register struct Function * f = &(((CordRep *)x) -> function);
-        register size_t j;
-        
-        for (j = i; ; j--) {
-            if ((*f1)((*(f -> fn))(j, f -> client_data), client_data)) {
-                return(1);
-            }
-            if (j == 0) return(0);
-        }
-    }
-}
-
-int CORD_riter(CORD x, CORD_iter_fn f1, void * client_data)
-{
-    return(CORD_riter4(x, CORD_len(x) - 1, f1, client_data));
-}
-
-/*
- * The following functions are concerned with balancing cords.
- * Strategy:
- * Scan the cord from left to right, keeping the cord scanned so far
- * as a forest of balanced trees of exponentialy decreasing length.
- * When a new subtree needs to be added to the forest, we concatenate all
- * shorter ones to the new tree in the appropriate order, and then insert
- * the result into the forest.
- * Crucial invariants:
- * 1. The concatenation of the forest (in decreasing order) with the
- *     unscanned part of the rope is equal to the rope being balanced.
- * 2. All trees in the forest are balanced.
- * 3. forest[i] has depth at most i.
- */
-
-typedef struct {
-    CORD c;
-    size_t len;		/* Actual length of c 	*/
-} ForestElement;
-
-static size_t min_len [ MAX_DEPTH ];
-
-static int min_len_init = 0;
-
-int CORD_max_len;
-
-typedef ForestElement Forest [ MAX_DEPTH ];
-			/* forest[i].len >= fib(i+1)	        */
-			/* The string is the concatenation	*/
-			/* of the forest in order of DECREASING */
-			/* indices.				*/
-
-void CORD_init_min_len()
-{
-    register int i;
-    register size_t last, previous, current;
-        
-    min_len[0] = previous = 1;
-    min_len[1] = last = 2;
-    for (i = 2; i < MAX_DEPTH; i++) {
-    	current = last + previous;
-    	if (current < last) /* overflow */ current = last;
-    	min_len[i] = current;
-    	previous = last;
-    	last = current;
-    }
-    CORD_max_len = last - 1;
-    min_len_init = 1;
-}
-
-
-void CORD_init_forest(ForestElement * forest, size_t max_len)
-{
-    register int i;
-    
-    for (i = 0; i < MAX_DEPTH; i++) {
-    	forest[i].c = 0;
-    	if (min_len[i] > max_len) return;
-    }
-    ABORT("Cord too long");
-}
-
-/* Add a leaf to the appropriate level in the forest, cleaning		*/
-/* out lower levels as necessary.					*/
-/* Also works if x is a balanced tree of concatenations; however	*/
-/* in this case an extra concatenation node may be inserted above x;	*/
-/* This node should not be counted in the statement of the invariants.	*/
-void CORD_add_forest(ForestElement * forest, CORD x, size_t len)
-{
-    register int i = 0;
-    register CORD sum = CORD_EMPTY;
-    register size_t sum_len = 0;
-    
-    while (len > min_len[i + 1]) {
-    	if (forest[i].c != 0) {
-    	    sum = CORD_cat(forest[i].c, sum);
-    	    sum_len += forest[i].len;
-    	    forest[i].c = 0;
-    	}
-        i++;
-    }
-    /* Sum has depth at most 1 greter than what would be required 	*/
-    /* for balance.							*/
-    sum = CORD_cat(sum, x);
-    sum_len += len;
-    /* If x was a leaf, then sum is now balanced.  To see this		*/
-    /* consider the two cases in which forest[i-1] either is or is 	*/
-    /* not empty.							*/
-    while (sum_len >= min_len[i]) {
-    	if (forest[i].c != 0) {
-    	    sum = CORD_cat(forest[i].c, sum);
-    	    sum_len += forest[i].len;
-    	    /* This is again balanced, since sum was balanced, and has	*/
-    	    /* allowable depth that differs from i by at most 1.	*/
-    	    forest[i].c = 0;
-    	}
-        i++;
-    }
-    i--;
-    forest[i].c = sum;
-    forest[i].len = sum_len;
-}
-
-CORD CORD_concat_forest(ForestElement * forest, size_t expected_len)
-{
-    register int i = 0;
-    CORD sum = 0;
-    size_t sum_len = 0;
-    
-    while (sum_len != expected_len) {
-    	if (forest[i].c != 0) {
-    	    sum = CORD_cat(forest[i].c, sum);
-    	    sum_len += forest[i].len;
-    	}
-        i++;
-    }
-    return(sum);
-}
-
-/* Insert the frontier of x into forest.  Balanced subtrees are	*/
-/* treated as leaves.  This potentially adds one to the depth	*/
-/* of the final tree.						*/
-void CORD_balance_insert(CORD x, size_t len, ForestElement * forest)
-{
-    register int depth;
-    
-    if (CORD_IS_STRING(x)) {
-        CORD_add_forest(forest, x, len);
-    } else if (IS_CONCATENATION(x)
-               && ((depth = DEPTH(x)) >= MAX_DEPTH
-                   || len < min_len[depth])) {
-    	register struct Concatenation * conc
-    			= &(((CordRep *)x) -> concatenation);
-    	size_t left_len = LEFT_LEN(conc);
-    	
-    	CORD_balance_insert(conc -> left, left_len, forest);
-    	CORD_balance_insert(conc -> right, len - left_len, forest);
-    } else /* function or balanced */ {
-    	CORD_add_forest(forest, x, len);
-    }
-}
-
-
-CORD CORD_balance(CORD x)
-{
-    Forest forest;
-    register size_t len;
-    
-    if (x == 0) return(0);
-    if (CORD_IS_STRING(x)) return(x);
-    if (!min_len_init) CORD_init_min_len();
-    len = LEN(x);
-    CORD_init_forest(forest, len);
-    CORD_balance_insert(x, len, forest);
-    return(CORD_concat_forest(forest, len));
-}
-
-
-/* Position primitives	*/
-
-/* Private routines to deal with the hard cases only: */
-
-/* P contains a prefix of the  path to cur_pos.	Extend it to a full	*/
-/* path and set up leaf info.						*/
-/* Return 0 if past the end of cord, 1 o.w.				*/
-void CORD__extend_path(register CORD_pos p)
-{
-     register struct CORD_pe * current_pe = &(p[0].path[p[0].path_len]);
-     register CORD top = current_pe -> pe_cord;
-     register size_t pos = p[0].cur_pos;
-     register size_t top_pos = current_pe -> pe_start_pos;
-     register size_t top_len = GEN_LEN(top);
-     
-     /* Fill in the rest of the path. */
-       while(!CORD_IS_STRING(top) && IS_CONCATENATION(top)) {
-     	 register struct Concatenation * conc =
-     	 		&(((CordRep *)top) -> concatenation);
-     	 register size_t left_len;
-     	 
-     	 left_len = LEFT_LEN(conc);
-     	 current_pe++;
-     	 if (pos >= top_pos + left_len) {
-     	     current_pe -> pe_cord = top = conc -> right;
-     	     current_pe -> pe_start_pos = top_pos = top_pos + left_len;
-     	     top_len -= left_len;
-     	 } else {
-     	     current_pe -> pe_cord = top = conc -> left;
-     	     current_pe -> pe_start_pos = top_pos;
-     	     top_len = left_len;
-     	 }
-     	 p[0].path_len++;
-       }
-     /* Fill in leaf description for fast access. */
-       if (CORD_IS_STRING(top)) {
-         p[0].cur_leaf = top;
-         p[0].cur_start = top_pos;
-         p[0].cur_end = top_pos + top_len;
-       } else {
-         p[0].cur_end = 0;
-       }
-       if (pos >= top_pos + top_len) p[0].path_len = CORD_POS_INVALID;
-}
-
-char CORD__pos_fetch(register CORD_pos p)
-{
-    /* Leaf is a function node */
-    struct CORD_pe * pe = &((p)[0].path[(p)[0].path_len]);
-    CORD leaf = pe -> pe_cord;
-    register struct Function * f = &(((CordRep *)leaf) -> function);
-    
-    if (!IS_FUNCTION(leaf)) ABORT("CORD_pos_fetch: bad leaf");
-    return ((*(f -> fn))(p[0].cur_pos - pe -> pe_start_pos, f -> client_data));
-}
-
-void CORD__next(register CORD_pos p)
-{
-    register size_t cur_pos = p[0].cur_pos + 1;
-    register struct CORD_pe * current_pe = &((p)[0].path[(p)[0].path_len]);
-    register CORD leaf = current_pe -> pe_cord;
-    
-    /* Leaf is not a string or we're at end of leaf */
-    p[0].cur_pos = cur_pos;
-    if (!CORD_IS_STRING(leaf)) {
-    	/* Function leaf	*/
-    	register struct Function * f = &(((CordRep *)leaf) -> function);
-    	register size_t start_pos = current_pe -> pe_start_pos;
-    	register size_t end_pos = start_pos + f -> len;
-    	
-    	if (cur_pos < end_pos) {
-    	  /* Fill cache and return. */
-    	    register size_t i;
-    	    register size_t limit = cur_pos + FUNCTION_BUF_SZ;
-    	    register CORD_fn fn = f -> fn;
-    	    register void * client_data = f -> client_data;
-    	    
-    	    if (limit > end_pos) {
-    	        limit = end_pos;
-    	    }
-    	    for (i = cur_pos; i < limit; i++) {
-    	        p[0].function_buf[i - cur_pos] =
-    	        	(*fn)(i - start_pos, client_data);
-    	    }
-    	    p[0].cur_start = cur_pos;
-    	    p[0].cur_leaf = p[0].function_buf;
-    	    p[0].cur_end = limit;
-    	    return;
-    	}
-    }
-    /* End of leaf	*/
-    /* Pop the stack until we find two concatenation nodes with the 	*/
-    /* same start position: this implies we were in left part.		*/
-    {
-    	while (p[0].path_len > 0
-    	       && current_pe[0].pe_start_pos != current_pe[-1].pe_start_pos) {
-    	    p[0].path_len--;
-    	    current_pe--;
-    	}
-    	if (p[0].path_len == 0) {
-	    p[0].path_len = CORD_POS_INVALID;
-            return;
-	}
-    }
-    p[0].path_len--;
-    CORD__extend_path(p);
-}
-
-void CORD__prev(register CORD_pos p)
-{
-    register struct CORD_pe * pe = &(p[0].path[p[0].path_len]);
-    
-    if (p[0].cur_pos == 0) {
-        p[0].path_len = CORD_POS_INVALID;
-        return;
-    }
-    p[0].cur_pos--;
-    if (p[0].cur_pos >= pe -> pe_start_pos) return;
-    
-    /* Beginning of leaf	*/
-    
-    /* Pop the stack until we find two concatenation nodes with the 	*/
-    /* different start position: this implies we were in right part.	*/
-    {
-    	register struct CORD_pe * current_pe = &((p)[0].path[(p)[0].path_len]);
-    	
-    	while (p[0].path_len > 0
-    	       && current_pe[0].pe_start_pos == current_pe[-1].pe_start_pos) {
-    	    p[0].path_len--;
-    	    current_pe--;
-    	}
-    }
-    p[0].path_len--;
-    CORD__extend_path(p);
-}
-
-#undef CORD_pos_fetch
-#undef CORD_next
-#undef CORD_prev
-#undef CORD_pos_to_index
-#undef CORD_pos_to_cord
-#undef CORD_pos_valid
-
-char CORD_pos_fetch(register CORD_pos p)
-{
-    if (p[0].cur_start <= p[0].cur_pos && p[0].cur_pos < p[0].cur_end) {
-    	return(p[0].cur_leaf[p[0].cur_pos - p[0].cur_start]);
-    } else {
-        return(CORD__pos_fetch(p));
-    }
-}
-
-void CORD_next(CORD_pos p)
-{
-    if (p[0].cur_pos < p[0].cur_end - 1) {
-    	p[0].cur_pos++;
-    } else {
-    	CORD__next(p);
-    }
-}
-
-void CORD_prev(CORD_pos p)
-{
-    if (p[0].cur_end != 0 && p[0].cur_pos > p[0].cur_start) {
-    	p[0].cur_pos--;
-    } else {
-    	CORD__prev(p);
-    }
-}
-
-size_t CORD_pos_to_index(CORD_pos p)
-{
-    return(p[0].cur_pos);
-}
-
-CORD CORD_pos_to_cord(CORD_pos p)
-{
-    return(p[0].path[0].pe_cord);
-}
-
-int CORD_pos_valid(CORD_pos p)
-{
-    return(p[0].path_len != CORD_POS_INVALID);
-}
-
-void CORD_set_pos(CORD_pos p, CORD x, size_t i)
-{
-    if (x == CORD_EMPTY) {
-    	p[0].path_len = CORD_POS_INVALID;
-    	return;
-    }
-    p[0].path[0].pe_cord = x;
-    p[0].path[0].pe_start_pos = 0;
-    p[0].path_len = 0;
-    p[0].cur_pos = i;
-    CORD__extend_path(p);
-}
diff --git a/boehm-gc/cord/cordprnt.c b/boehm-gc/cord/cordprnt.c
deleted file mode 100644
index 6d278feda65..00000000000
--- a/boehm-gc/cord/cordprnt.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* 
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* An sprintf implementation that understands cords.  This is probably	*/
-/* not terribly portable.  It assumes an ANSI stdarg.h.  It further	*/
-/* assumes that I can make copies of va_list variables, and read 	*/
-/* arguments repeatedly by applyting va_arg to the copies.  This	*/
-/* could be avoided at some performance cost.				*/
-/* We also assume that unsigned and signed integers of various kinds	*/
-/* have the same sizes, and can be cast back and forth.			*/
-/* We assume that void * and char * have the same size.			*/
-/* All this cruft is needed because we want to rely on the underlying	*/
-/* sprintf implementation whenever possible.				*/
-/* Boehm, September 21, 1995 6:00 pm PDT */
-
-#include "cord.h"
-#include "ec.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include "gc.h"
-
-#define CONV_SPEC_LEN 50	/* Maximum length of a single	*/
-				/* conversion specification.	*/
-#define CONV_RESULT_LEN 50	/* Maximum length of any 	*/
-				/* conversion with default	*/
-				/* width and prec.		*/
-
-
-static int ec_len(CORD_ec x)
-{
-    return(CORD_len(x[0].ec_cord) + (x[0].ec_bufptr - x[0].ec_buf));
-}
-
-/* Possible nonumeric precision values.	*/
-# define NONE -1
-# define VARIABLE -2
-/* Copy the conversion specification from CORD_pos into the buffer buf	*/
-/* Return negative on error.						*/
-/* Source initially points one past the leading %.			*/
-/* It is left pointing at the conversion type.				*/
-/* Assign field width and precision to *width and *prec.		*/
-/* If width or prec is *, VARIABLE is assigned.				*/
-/* Set *left to 1 if left adjustment flag is present.			*/
-/* Set *long_arg to 1 if long flag ('l' or 'L') is present, or to	*/
-/* -1 if 'h' is present.						*/
-static int extract_conv_spec(CORD_pos source, char *buf,
-			     int * width, int *prec, int *left, int * long_arg)
-{
-    register int result = 0;
-    register int current_number = 0;
-    register int saw_period = 0;
-    register int saw_number = 0;
-    register int chars_so_far = 0;
-    register char current;
-    
-    *width = NONE;
-    buf[chars_so_far++] = '%';
-    while(CORD_pos_valid(source)) {
-        if (chars_so_far >= CONV_SPEC_LEN) return(-1);
-        current = CORD_pos_fetch(source);
-        buf[chars_so_far++] = current;
-        switch(current) {
-	  case '*':
-	    saw_number = 1;
-	    current_number = VARIABLE;
-	    break;
-          case '0':
-            if (!saw_number) {
-                /* Zero fill flag; ignore */
-                break;
-            } /* otherwise fall through: */
-          case '1':
-	  case '2':
-	  case '3':
-	  case '4':
-	  case '5':
-          case '6':
-	  case '7':
-	  case '8':
-	  case '9':
-	    saw_number = 1;
-	    current_number *= 10;
-	    current_number += current - '0';
-	    break;
-	  case '.':
-	    saw_period = 1;
-	    if(saw_number) {
-	        *width = current_number;
-	        saw_number = 0;
-	    }
-	    current_number = 0;
-	    break;
-	  case 'l':
-	  case 'L':
-	    *long_arg = 1;
-	    current_number = 0;
-	    break;
-	  case 'h':
-	    *long_arg = -1;
-	    current_number = 0;
-	    break;
-	  case ' ':
-	  case '+':
-	  case '#':
-	    current_number = 0;
-	    break;
-	  case '-':
-	    *left = 1;
-	    current_number = 0;
-	    break;
-	  case 'd':
-	  case 'i':
-	  case 'o':
-	  case 'u':
-	  case 'x':
-	  case 'X':
-	  case 'f':
-	  case 'e':
-	  case 'E':
-	  case 'g':
-	  case 'G':
-	  case 'c':
-	  case 'C':
-	  case 's':
-	  case 'S':
-	  case 'p':
-	  case 'n':
-	  case 'r':
-	    goto done;          
-          default:
-            return(-1);
-        }
-        CORD_next(source);
-    }
-    return(-1);
-  done:
-    if (saw_number) {
-    	if (saw_period) {
-    	    *prec = current_number;
-    	} else {
-    	    *prec = NONE;
-    	    *width = current_number;
-    	}
-    } else {
-    	*prec = NONE;
-    }
-    buf[chars_so_far] = '\0';
-    return(result);
-}
-
-int CORD_vsprintf(CORD * out, CORD format, va_list args)
-{
-    CORD_ec result;
-    register int count;
-    register char current;
-    CORD_pos pos;
-    char conv_spec[CONV_SPEC_LEN + 1];
-    
-    CORD_ec_init(result);
-    for (CORD_set_pos(pos, format, 0); CORD_pos_valid(pos); CORD_next(pos)) {
-       	current = CORD_pos_fetch(pos);
-       	if (current == '%') {
-            CORD_next(pos);
-            if (!CORD_pos_valid(pos)) return(-1);
-            current = CORD_pos_fetch(pos);
-            if (current == '%') {
-               	CORD_ec_append(result, current);
-            } else {
-             	int width, prec;
-             	int left_adj = 0;
-             	int long_arg = 0;
-		CORD arg;
-		size_t len;
-               
-              	if (extract_conv_spec(pos, conv_spec,
-              			      &width, &prec,
-              			      &left_adj, &long_arg) < 0) {
-              	    return(-1);
-              	}
-              	current = CORD_pos_fetch(pos);
-            	switch(current) {
-            	    case 'n':
-            	    	/* Assign length to next arg */
-            	    	if (long_arg == 0) {
-            	    	    int * pos_ptr;
-            	    	    pos_ptr = va_arg(args, int *);
-            	    	    *pos_ptr = ec_len(result);
-            	    	} else if (long_arg > 0) {
-            	    	    long * pos_ptr;
-            	    	    pos_ptr = va_arg(args, long *);
-            	    	    *pos_ptr = ec_len(result);
-            	    	} else {
-            	    	    short * pos_ptr;
-            	    	    pos_ptr = va_arg(args, short *);
-            	    	    *pos_ptr = ec_len(result);
-            	    	}
-            	    	goto done;
-            	    case 'r':
-            	    	/* Append cord and any padding	*/
-            	    	if (width == VARIABLE) width = va_arg(args, int);
-            	    	if (prec == VARIABLE) prec = va_arg(args, int);
-			arg = va_arg(args, CORD);
-			len = CORD_len(arg);
-			if (prec != NONE && len > prec) {
-			  if (prec < 0) return(-1);
-			  arg = CORD_substr(arg, 0, prec);
-			  len = prec;
-			}
-			if (width != NONE && len < width) {
-			  char * blanks = GC_MALLOC_ATOMIC(width-len+1);
-
-			  memset(blanks, ' ', width-len);
-			  blanks[width-len] = '\0';
-			  if (left_adj) {
-			    arg = CORD_cat(arg, blanks);
-			  } else {
-			    arg = CORD_cat(blanks, arg);
-			  }
-			}
-			CORD_ec_append_cord(result, arg);
-            	    	goto done;
-		    case 'c':
-			if (width == NONE && prec == NONE) {
-			    register char c;
-
-			    c = (char)va_arg(args, int);
-			    CORD_ec_append(result, c);
-			    goto done;
-			}
-			break;
-		    case 's':
-		        if (width == NONE && prec == NONE) {
-			    char * str = va_arg(args, char *);
-			    register char c;
-
-			    while ((c = *str++)) {
-			        CORD_ec_append(result, c);
-			    }
-			    goto done;
-			}
-			break;
-            	    default:
-            	        break;
-            	}
-            	/* Use standard sprintf to perform conversion */
-            	{
-            	    register char * buf;
-            	    va_list vsprintf_args;
-            	    int max_size = 0;
-            	    int res;
-#		    ifdef __va_copy
-                      __va_copy(vsprintf_args, args);
-#		    else
-#		      if defined(__GNUC__) && !defined(__DJGPP__) /* and probably in other cases */
-                        va_copy(vsprintf_args, args);
-#		      else
-			vsprintf_args = args;
-#		      endif
-#		    endif
-            	    if (width == VARIABLE) width = va_arg(args, int);
-            	    if (prec == VARIABLE) prec = va_arg(args, int);
-            	    if (width != NONE) max_size = width;
-            	    if (prec != NONE && prec > max_size) max_size = prec;
-            	    max_size += CONV_RESULT_LEN;
-            	    if (max_size >= CORD_BUFSZ) {
-            	        buf = GC_MALLOC_ATOMIC(max_size + 1);
-            	    } else {
-            	        if (CORD_BUFSZ - (result[0].ec_bufptr-result[0].ec_buf)
-            	            < max_size) {
-            	            CORD_ec_flush_buf(result);
-            	        }
-            	        buf = result[0].ec_bufptr;
-            	    }
-            	    switch(current) {
-            	        case 'd':
-            	        case 'i':
-            	        case 'o':
-            	        case 'u':
-            	        case 'x':
-            	        case 'X':
-            	        case 'c':
-            	            if (long_arg <= 0) {
-            	              (void) va_arg(args, int);
-            	            } else if (long_arg > 0) {
-            	              (void) va_arg(args, long);
-            	            }
-            	            break;
-            	        case 's':
-            	        case 'p':
-            	            (void) va_arg(args, char *);
-            	            break;
-            	        case 'f':
-            	        case 'e':
-            	        case 'E':
-            	        case 'g':
-            	        case 'G':
-            	            (void) va_arg(args, double);
-            	            break;
-            	        default:
-            	            return(-1);
-            	    }
-            	    res = vsprintf(buf, conv_spec, vsprintf_args);
-            	    len = (size_t)res;
-            	    if ((char *)(GC_word)res == buf) {
-            	    	/* old style vsprintf */
-            	    	len = strlen(buf);
-            	    } else if (res < 0) {
-            	        return(-1);
-            	    }
-            	    if (buf != result[0].ec_bufptr) {
-            	        register char c;
-
-			while ((c = *buf++)) {
-			    CORD_ec_append(result, c);
-		        }
-		    } else {
-		        result[0].ec_bufptr = buf + len;
-		    }
-            	}
-              done:;
-            }
-        } else {
-            CORD_ec_append(result, current);
-        }
-    }
-    count = ec_len(result);
-    *out = CORD_balance(CORD_ec_to_cord(result));
-    return(count);
-}
-
-int CORD_sprintf(CORD * out, CORD format, ...)
-{
-    va_list args;
-    int result;
-    
-    va_start(args, format);
-    result = CORD_vsprintf(out, format, args);
-    va_end(args);
-    return(result);
-}
-
-int CORD_fprintf(FILE * f, CORD format, ...)
-{
-    va_list args;
-    int result;
-    CORD out;
-    
-    va_start(args, format);
-    result = CORD_vsprintf(&out, format, args);
-    va_end(args);
-    if (result > 0) CORD_put(out, f);
-    return(result);
-}
-
-int CORD_vfprintf(FILE * f, CORD format, va_list args)
-{
-    int result;
-    CORD out;
-    
-    result = CORD_vsprintf(&out, format, args);
-    if (result > 0) CORD_put(out, f);
-    return(result);
-}
-
-int CORD_printf(CORD format, ...)
-{
-    va_list args;
-    int result;
-    CORD out;
-    
-    va_start(args, format);
-    result = CORD_vsprintf(&out, format, args);
-    va_end(args);
-    if (result > 0) CORD_put(out, stdout);
-    return(result);
-}
-
-int CORD_vprintf(CORD format, va_list args)
-{
-    int result;
-    CORD out;
-    
-    result = CORD_vsprintf(&out, format, args);
-    if (result > 0) CORD_put(out, stdout);
-    return(result);
-}
diff --git a/boehm-gc/cord/cordtest.c b/boehm-gc/cord/cordtest.c
deleted file mode 100644
index 08333ca0434..00000000000
--- a/boehm-gc/cord/cordtest.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* 
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, August 24, 1994 11:58 am PDT */
-# include "gc.h"	/* For GC_INIT() only */
-# include "cord.h"
-# include <string.h>
-# include <stdio.h>
-# include <stdlib.h>
-/* This is a very incomplete test of the cord package.  It knows about	*/
-/* a few internals of the package (e.g. when C strings are returned)	*/
-/* that real clients shouldn't rely on.					*/
-
-# define ABORT(string) \
-{ int x = 0; fprintf(stderr, "FAILED: %s\n", string); x = 1 / x; abort(); }
-
-int count;
-
-int test_fn(char c, void * client_data)
-{
-    if (client_data != (void *)13) ABORT("bad client data");
-    if (count < 64*1024+1) {
-        if ((count & 1) == 0) {
-            if (c != 'b') ABORT("bad char");
-        } else {
-            if (c != 'a') ABORT("bad char");
-        }
-        count++;
-        return(0);
-    } else {
-        if (c != 'c') ABORT("bad char");
-        count++;
-        return(1);
-    }
-}
-
-char id_cord_fn(size_t i, void * client_data)
-{
-    return((char)i);
-}
-
-void test_basics()
-{
-    CORD x = CORD_from_char_star("ab");
-    register int i;
-    char c;
-    CORD y;
-    CORD_pos p;
-    
-    x = CORD_cat(x,x);
-    if (!CORD_IS_STRING(x)) ABORT("short cord should usually be a string");
-    if (strcmp(x, "abab") != 0) ABORT("bad CORD_cat result");
-    
-    for (i = 1; i < 16; i++) {
-        x = CORD_cat(x,x);
-    }
-    x = CORD_cat(x,"c");
-    if (CORD_len(x) != 128*1024+1) ABORT("bad length");
-    
-    count = 0;
-    if (CORD_iter5(x, 64*1024-1, test_fn, CORD_NO_FN, (void *)13) == 0) {
-        ABORT("CORD_iter5 failed");
-    }
-    if (count != 64*1024 + 2) ABORT("CORD_iter5 failed");
-    
-    count = 0;
-    CORD_set_pos(p, x, 64*1024-1);
-    while(CORD_pos_valid(p)) {
-       	(void) test_fn(CORD_pos_fetch(p), (void *)13);
-	CORD_next(p);
-    }
-    if (count != 64*1024 + 2) ABORT("Position based iteration failed");
-    
-    y = CORD_substr(x, 1023, 5);
-    if (!CORD_IS_STRING(y)) ABORT("short cord should usually be a string");
-    if (strcmp(y, "babab") != 0) ABORT("bad CORD_substr result");
-    
-    y = CORD_substr(x, 1024, 8);
-    if (!CORD_IS_STRING(y)) ABORT("short cord should usually be a string");
-    if (strcmp(y, "abababab") != 0) ABORT("bad CORD_substr result");
-    
-    y = CORD_substr(x, 128*1024-1, 8);
-    if (!CORD_IS_STRING(y)) ABORT("short cord should usually be a string");
-    if (strcmp(y, "bc") != 0) ABORT("bad CORD_substr result");
-    
-    x = CORD_balance(x);
-    if (CORD_len(x) != 128*1024+1) ABORT("bad length");
-    
-    count = 0;
-    if (CORD_iter5(x, 64*1024-1, test_fn, CORD_NO_FN, (void *)13) == 0) {
-        ABORT("CORD_iter5 failed");
-    }
-    if (count != 64*1024 + 2) ABORT("CORD_iter5 failed");
-    
-    y = CORD_substr(x, 1023, 5);
-    if (!CORD_IS_STRING(y)) ABORT("short cord should usually be a string");
-    if (strcmp(y, "babab") != 0) ABORT("bad CORD_substr result");
-    y = CORD_from_fn(id_cord_fn, 0, 13);
-    i = 0;
-    CORD_set_pos(p, y, i);
-    while(CORD_pos_valid(p)) {
-        c = CORD_pos_fetch(p);
-       	if(c != i) ABORT("Traversal of function node failed");
-	CORD_next(p); i++;
-    }
-    if (i != 13) ABORT("Bad apparent length for function node");
-}
-
-void test_extras()
-{
-#   if defined(__OS2__) || defined(__DJGPP__)
-#	define FNAME1 "tmp1"
-#	define FNAME2 "tmp2"
-#   elif defined(AMIGA)
-#	define FNAME1 "T:tmp1"
-#	define FNAME2 "T:tmp2"
-#   else
-#	define FNAME1 "/tmp/cord_test"
-#	define FNAME2 "/tmp/cord_test2"
-#   endif
-    register int i;
-    CORD y = "abcdefghijklmnopqrstuvwxyz0123456789";
-    CORD x = "{}";
-    CORD w, z;
-    FILE *f;
-    FILE *f1a, *f1b, *f2;
-    
-    w = CORD_cat(CORD_cat(y,y),y);
-    z = CORD_catn(3,y,y,y);
-    if (CORD_cmp(w,z) != 0) ABORT("CORD_catn comparison wrong");
-    for (i = 1; i < 100; i++) {
-        x = CORD_cat(x, y);
-    }
-    z = CORD_balance(x);
-    if (CORD_cmp(x,z) != 0) ABORT("balanced string comparison wrong");
-    if (CORD_cmp(x,CORD_cat(z, CORD_nul(13))) >= 0) ABORT("comparison 2");
-    if (CORD_cmp(CORD_cat(x, CORD_nul(13)), z) <= 0) ABORT("comparison 3");
-    if (CORD_cmp(x,CORD_cat(z, "13")) >= 0) ABORT("comparison 4");
-    if ((f = fopen(FNAME1, "w")) == 0) ABORT("open failed");
-    if (CORD_put(z,f) == EOF) ABORT("CORD_put failed");
-    if (fclose(f) == EOF) ABORT("fclose failed");
-    w = CORD_from_file(f1a = fopen(FNAME1, "rb"));
-    if (CORD_len(w) != CORD_len(z)) ABORT("file length wrong");
-    if (CORD_cmp(w,z) != 0) ABORT("file comparison wrong");
-    if (CORD_cmp(CORD_substr(w, 50*36+2, 36), y) != 0)
-    	ABORT("file substr wrong");
-    z = CORD_from_file_lazy(f1b = fopen(FNAME1, "rb"));
-    if (CORD_cmp(w,z) != 0) ABORT("File conversions differ");
-    if (CORD_chr(w, 0, '9') != 37) ABORT("CORD_chr failed 1");
-    if (CORD_chr(w, 3, 'a') != 38) ABORT("CORD_chr failed 2");
-    if (CORD_rchr(w, CORD_len(w) - 1, '}') != 1) ABORT("CORD_rchr failed");
-    x = y;
-    for (i = 1; i < 14; i++) {
-        x = CORD_cat(x,x);
-    }
-    if ((f = fopen(FNAME2, "w")) == 0) ABORT("2nd open failed");
-#   ifdef __DJGPP__
-      /* FIXME: DJGPP workaround.  Why does this help? */
-      if (fflush(f) != 0) ABORT("fflush failed");
-#   endif
-    if (CORD_put(x,f) == EOF) ABORT("CORD_put failed");
-    if (fclose(f) == EOF) ABORT("fclose failed");
-    w = CORD_from_file(f2 = fopen(FNAME2, "rb"));
-    if (CORD_len(w) != CORD_len(x)) ABORT("file length wrong");
-    if (CORD_cmp(w,x) != 0) ABORT("file comparison wrong");
-    if (CORD_cmp(CORD_substr(w, 1000*36, 36), y) != 0)
-    	ABORT("file substr wrong");
-    if (strcmp(CORD_to_char_star(CORD_substr(w, 1000*36, 36)), y) != 0)
-    	ABORT("char * file substr wrong");
-    if (strcmp(CORD_substr(w, 1000*36, 2), "ab") != 0)
-    	ABORT("short file substr wrong");
-    if (CORD_str(x,1,"9a") != 35) ABORT("CORD_str failed 1");
-    if (CORD_str(x,0,"9abcdefghijk") != 35) ABORT("CORD_str failed 2");
-    if (CORD_str(x,0,"9abcdefghijx") != CORD_NOT_FOUND)
-    	ABORT("CORD_str failed 3");
-    if (CORD_str(x,0,"9>") != CORD_NOT_FOUND) ABORT("CORD_str failed 4");
-    if (remove(FNAME1) != 0) {
-    	/* On some systems, e.g. OS2, this may fail if f1 is still open. */
-    	if ((fclose(f1a) == EOF) & (fclose(f1b) == EOF))
-    		ABORT("fclose(f1) failed");
-    	if (remove(FNAME1) != 0) ABORT("remove 1 failed");
-    }
-    if (remove(FNAME2) != 0) {
-    	if (fclose(f2) == EOF) ABORT("fclose(f2) failed");
-    	if (remove(FNAME2) != 0) ABORT("remove 2 failed");
-    }
-}
-
-void test_printf()
-{
-    CORD result;
-    char result2[200];
-    long l;
-    short s;
-    CORD x;
-    
-    if (CORD_sprintf(&result, "%7.2f%ln", 3.14159F, &l) != 7)
-    	ABORT("CORD_sprintf failed 1");
-    if (CORD_cmp(result, "   3.14") != 0)ABORT("CORD_sprintf goofed 1");
-    if (l != 7) ABORT("CORD_sprintf goofed 2");
-    if (CORD_sprintf(&result, "%-7.2s%hn%c%s", "abcd", &s, 'x', "yz") != 10)
-    	ABORT("CORD_sprintf failed 2");
-    if (CORD_cmp(result, "ab     xyz") != 0)ABORT("CORD_sprintf goofed 3");
-    if (s != 7) ABORT("CORD_sprintf goofed 4");
-    x = "abcdefghij";
-    x = CORD_cat(x,x);
-    x = CORD_cat(x,x);
-    x = CORD_cat(x,x);
-    if (CORD_sprintf(&result, "->%-120.78r!\n", x) != 124)
-    	ABORT("CORD_sprintf failed 3");
-    (void) sprintf(result2, "->%-120.78s!\n", CORD_to_char_star(x));
-    if (CORD_cmp(result, result2) != 0)ABORT("CORD_sprintf goofed 5");
-}
-
-int main()
-{
-#   ifdef THINK_C
-        printf("cordtest:\n");
-#   endif
-    GC_INIT();
-    test_basics();
-    test_extras();
-    test_printf();
-    CORD_fprintf(stderr, "SUCCEEDED\n");
-    return(0);
-}
diff --git a/boehm-gc/cord/cordxtra.c b/boehm-gc/cord/cordxtra.c
deleted file mode 100644
index b0a746226cb..00000000000
--- a/boehm-gc/cord/cordxtra.c
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Author: Hans-J. Boehm (boehm@parc.xerox.com)
- */
-/*
- * These are functions on cords that do not need to understand their
- * implementation.  They serve also serve as example client code for
- * cord_basics.
- */
-/* Boehm, December 8, 1995 1:53 pm PST */
-# include <stdio.h>
-# include <string.h>
-# include <stdlib.h>
-# include <stdarg.h>
-# include "cord.h"
-# include "ec.h"
-# define I_HIDE_POINTERS	/* So we get access to allocation lock.	*/
-				/* We use this for lazy file reading, 	*/
-				/* so that we remain independent 	*/
-				/* of the threads primitives.		*/
-# include "gc.h"
-
-/* For now we assume that pointer reads and writes are atomic, 	*/
-/* i.e. another thread always sees the state before or after	*/
-/* a write.  This might be false on a Motorola M68K with	*/
-/* pointers that are not 32-bit aligned.  But there probably	*/
-/* aren't too many threads packages running on those.		*/
-# define ATOMIC_WRITE(x,y) (x) = (y)
-# define ATOMIC_READ(x) (*(x))
-
-/* The standard says these are in stdio.h, but they aren't always: */
-# ifndef SEEK_SET
-#   define SEEK_SET 0
-# endif
-# ifndef SEEK_END
-#   define SEEK_END 2
-# endif
-
-# define BUFSZ 2048	/* Size of stack allocated buffers when		*/
-			/* we want large buffers.			*/
-
-typedef void (* oom_fn)(void);
-
-# define OUT_OF_MEMORY {  if (CORD_oom_fn != (oom_fn) 0) (*CORD_oom_fn)(); \
-			  ABORT("Out of memory\n"); }
-# define ABORT(msg) { fprintf(stderr, "%s\n", msg); abort(); }
-
-CORD CORD_cat_char(CORD x, char c)
-{
-    register char * string;
-    
-    if (c == '\0') return(CORD_cat(x, CORD_nul(1)));
-    string = GC_MALLOC_ATOMIC(2);
-    if (string == 0) OUT_OF_MEMORY;
-    string[0] = c;
-    string[1] = '\0';
-    return(CORD_cat_char_star(x, string, 1));
-}
-
-CORD CORD_catn(int nargs, ...)
-{
-    register CORD result = CORD_EMPTY;
-    va_list args;
-    register int i;
-
-    va_start(args, nargs);
-    for (i = 0; i < nargs; i++) {
-        register CORD next = va_arg(args, CORD);
-        result = CORD_cat(result, next);
-    }
-    va_end(args);
-    return(result);
-}
-
-typedef struct {
-	size_t len;
-	size_t count;
-	char * buf;
-} CORD_fill_data;
-
-int CORD_fill_proc(char c, void * client_data)
-{
-    register CORD_fill_data * d = (CORD_fill_data *)client_data;
-    register size_t count = d -> count;
-    
-    (d -> buf)[count] = c;
-    d -> count = ++count;
-    if (count >= d -> len) {
-    	return(1);
-    } else {
-    	return(0);
-    }
-}
-
-int CORD_batched_fill_proc(const char * s, void * client_data)
-{
-    register CORD_fill_data * d = (CORD_fill_data *)client_data;
-    register size_t count = d -> count;
-    register size_t max = d -> len;
-    register char * buf = d -> buf;
-    register const char * t = s;
-    
-    while((buf[count] = *t++) != '\0') {
-        count++;
-        if (count >= max) {
-            d -> count = count;
-            return(1);
-        }
-    }
-    d -> count = count;
-    return(0);
-}
-
-/* Fill buf with len characters starting at i.  			*/
-/* Assumes len characters are available.				*/ 
-void CORD_fill_buf(CORD x, size_t i, size_t len, char * buf)
-{
-    CORD_fill_data fd;
-    
-    fd.len = len;
-    fd.buf = buf;
-    fd.count = 0;
-    (void)CORD_iter5(x, i, CORD_fill_proc, CORD_batched_fill_proc, &fd);
-}
-
-int CORD_cmp(CORD x, CORD y)
-{
-    CORD_pos xpos;
-    CORD_pos ypos;
-    register size_t avail, yavail;
-    
-    if (y == CORD_EMPTY) return(x != CORD_EMPTY);
-    if (x == CORD_EMPTY) return(-1);
-    if (CORD_IS_STRING(y) && CORD_IS_STRING(x)) return(strcmp(x,y));
-    CORD_set_pos(xpos, x, 0);
-    CORD_set_pos(ypos, y, 0);
-    for(;;) {
-        if (!CORD_pos_valid(xpos)) {
-            if (CORD_pos_valid(ypos)) {
-            	return(-1);
-            } else {
-                return(0);
-            }
-        }
-        if (!CORD_pos_valid(ypos)) {
-            return(1);
-        }
-        if ((avail = CORD_pos_chars_left(xpos)) <= 0
-            || (yavail = CORD_pos_chars_left(ypos)) <= 0) {
-            register char xcurrent = CORD_pos_fetch(xpos);
-            register char ycurrent = CORD_pos_fetch(ypos);
-            if (xcurrent != ycurrent) return(xcurrent - ycurrent);
-            CORD_next(xpos);
-            CORD_next(ypos);
-        } else {
-            /* process as many characters as we can	*/
-            register int result;
-            
-            if (avail > yavail) avail = yavail;
-            result = strncmp(CORD_pos_cur_char_addr(xpos),
-            		     CORD_pos_cur_char_addr(ypos), avail);
-            if (result != 0) return(result);
-            CORD_pos_advance(xpos, avail);
-            CORD_pos_advance(ypos, avail);
-        }
-    }
-}
-
-int CORD_ncmp(CORD x, size_t x_start, CORD y, size_t y_start, size_t len)
-{
-    CORD_pos xpos;
-    CORD_pos ypos;
-    register size_t count;
-    register long avail, yavail;
-    
-    CORD_set_pos(xpos, x, x_start);
-    CORD_set_pos(ypos, y, y_start);
-    for(count = 0; count < len;) {
-        if (!CORD_pos_valid(xpos)) {
-            if (CORD_pos_valid(ypos)) {
-            	return(-1);
-            } else {
-                return(0);
-            }
-        }
-        if (!CORD_pos_valid(ypos)) {
-            return(1);
-        }
-        if ((avail = CORD_pos_chars_left(xpos)) <= 0
-            || (yavail = CORD_pos_chars_left(ypos)) <= 0) {
-            register char xcurrent = CORD_pos_fetch(xpos);
-            register char ycurrent = CORD_pos_fetch(ypos);
-            if (xcurrent != ycurrent) return(xcurrent - ycurrent);
-            CORD_next(xpos);
-            CORD_next(ypos);
-            count++;
-        } else {
-            /* process as many characters as we can	*/
-            register int result;
-            
-            if (avail > yavail) avail = yavail;
-            count += avail;
-            if (count > len) avail -= (count - len);
-            result = strncmp(CORD_pos_cur_char_addr(xpos),
-            		     CORD_pos_cur_char_addr(ypos), (size_t)avail);
-            if (result != 0) return(result);
-            CORD_pos_advance(xpos, (size_t)avail);
-            CORD_pos_advance(ypos, (size_t)avail);
-        }
-    }
-    return(0);
-}
-
-char * CORD_to_char_star(CORD x)
-{
-    register size_t len = CORD_len(x);
-    char * result = GC_MALLOC_ATOMIC(len + 1);
-    
-    if (result == 0) OUT_OF_MEMORY;
-    CORD_fill_buf(x, 0, len, result);
-    result[len] = '\0';
-    return(result);
-}
-
-CORD CORD_from_char_star(const char *s)
-{
-    char * result;
-    size_t len = strlen(s);
-
-    if (0 == len) return(CORD_EMPTY);
-    result = GC_MALLOC_ATOMIC(len + 1);
-    if (result == 0) OUT_OF_MEMORY;
-    memcpy(result, s, len+1);
-    return(result);
-}
-
-const char * CORD_to_const_char_star(CORD x)
-{
-    if (x == 0) return("");
-    if (CORD_IS_STRING(x)) return((const char *)x);
-    return(CORD_to_char_star(x));
-}
-
-char CORD_fetch(CORD x, size_t i)
-{
-    CORD_pos xpos;
-    
-    CORD_set_pos(xpos, x, i);
-    if (!CORD_pos_valid(xpos)) ABORT("bad index?");
-    return(CORD_pos_fetch(xpos));
-}
-
-
-int CORD_put_proc(char c, void * client_data)
-{
-    register FILE * f = (FILE *)client_data;
-    
-    return(putc(c, f) == EOF);
-}
-
-int CORD_batched_put_proc(const char * s, void * client_data)
-{
-    register FILE * f = (FILE *)client_data;
-    
-    return(fputs(s, f) == EOF);
-}
-    
-
-int CORD_put(CORD x, FILE * f)
-{
-    if (CORD_iter5(x, 0, CORD_put_proc, CORD_batched_put_proc, f)) {
-        return(EOF);
-    } else {
-    	return(1);
-    }
-}
-
-typedef struct {
-    size_t pos;		/* Current position in the cord */
-    char target;	/* Character we're looking for	*/
-} chr_data;
-
-int CORD_chr_proc(char c, void * client_data)
-{
-    register chr_data * d = (chr_data *)client_data;
-    
-    if (c == d -> target) return(1);
-    (d -> pos) ++;
-    return(0);
-}
-
-int CORD_rchr_proc(char c, void * client_data)
-{
-    register chr_data * d = (chr_data *)client_data;
-    
-    if (c == d -> target) return(1);
-    (d -> pos) --;
-    return(0);
-}
-
-int CORD_batched_chr_proc(const char *s, void * client_data)
-{
-    register chr_data * d = (chr_data *)client_data;
-    register char * occ = strchr(s, d -> target);
-    
-    if (occ == 0) {
-      	d -> pos += strlen(s);
-      	return(0);
-    } else {
-    	d -> pos += occ - s;
-    	return(1);
-    }
-}
-
-size_t CORD_chr(CORD x, size_t i, int c)
-{
-    chr_data d;
-    
-    d.pos = i;
-    d.target = c;
-    if (CORD_iter5(x, i, CORD_chr_proc, CORD_batched_chr_proc, &d)) {
-        return(d.pos);
-    } else {
-    	return(CORD_NOT_FOUND);
-    }
-}
-
-size_t CORD_rchr(CORD x, size_t i, int c)
-{
-    chr_data d;
-    
-    d.pos = i;
-    d.target = c;
-    if (CORD_riter4(x, i, CORD_rchr_proc, &d)) {
-        return(d.pos);
-    } else {
-    	return(CORD_NOT_FOUND);
-    }
-}
-
-/* Find the first occurrence of s in x at position start or later.	*/
-/* This uses an asymptotically poor algorithm, which should typically 	*/
-/* perform acceptably.  We compare the first few characters directly,	*/
-/* and call CORD_ncmp whenever there is a partial match.		*/
-/* This has the advantage that we allocate very little, or not at all.	*/
-/* It's very fast if there are few close misses.			*/
-size_t CORD_str(CORD x, size_t start, CORD s)
-{
-    CORD_pos xpos;
-    size_t xlen = CORD_len(x);
-    size_t slen;
-    register size_t start_len;
-    const char * s_start;
-    unsigned long s_buf = 0;	/* The first few characters of s	*/
-    unsigned long x_buf = 0;	/* Start of candidate substring.	*/
-    				/* Initialized only to make compilers	*/
-    				/* happy.				*/
-    unsigned long mask = 0;
-    register size_t i;
-    register size_t match_pos;
-    
-    if (s == CORD_EMPTY) return(start);
-    if (CORD_IS_STRING(s)) {
-        s_start = s;
-        slen = strlen(s);
-    } else {
-        s_start = CORD_to_char_star(CORD_substr(s, 0, sizeof(unsigned long)));
-        slen = CORD_len(s);
-    }
-    if (xlen < start || xlen - start < slen) return(CORD_NOT_FOUND);
-    start_len = slen;
-    if (start_len > sizeof(unsigned long)) start_len = sizeof(unsigned long);
-    CORD_set_pos(xpos, x, start);
-    for (i = 0; i < start_len; i++) {
-        mask <<= 8;
-        mask |= 0xff;
-        s_buf <<= 8;
-        s_buf |= (unsigned char)s_start[i];
-        x_buf <<= 8;
-        x_buf |= (unsigned char)CORD_pos_fetch(xpos);
-        CORD_next(xpos);
-    }
-    for (match_pos = start; ; match_pos++) {
-    	if ((x_buf & mask) == s_buf) {
-    	    if (slen == start_len ||
-    	     	CORD_ncmp(x, match_pos + start_len,
-    	     	 	  s, start_len, slen - start_len) == 0) {
-    	        return(match_pos);
-    	    }
-    	}
-	if ( match_pos == xlen - slen ) {
-	    return(CORD_NOT_FOUND);
-	}
-    	x_buf <<= 8;
-        x_buf |= (unsigned char)CORD_pos_fetch(xpos);
-        CORD_next(xpos);
-    }
-}
-
-void CORD_ec_flush_buf(CORD_ec x)
-{
-    register size_t len = x[0].ec_bufptr - x[0].ec_buf;
-    char * s;
-
-    if (len == 0) return;
-    s = GC_MALLOC_ATOMIC(len+1);
-    memcpy(s, x[0].ec_buf, len);
-    s[len] = '\0';
-    x[0].ec_cord = CORD_cat_char_star(x[0].ec_cord, s, len);
-    x[0].ec_bufptr = x[0].ec_buf;
-}
-
-void CORD_ec_append_cord(CORD_ec x, CORD s)
-{
-    CORD_ec_flush_buf(x);
-    x[0].ec_cord = CORD_cat(x[0].ec_cord, s);
-}
-
-/*ARGSUSED*/
-char CORD_nul_func(size_t i, void * client_data)
-{
-    return((char)(unsigned long)client_data);
-}
-
-
-CORD CORD_chars(char c, size_t i)
-{
-    return(CORD_from_fn(CORD_nul_func, (void *)(unsigned long)c, i));
-}
-
-CORD CORD_from_file_eager(FILE * f)
-{
-    register int c;
-    CORD_ec ecord;
-    
-    CORD_ec_init(ecord);
-    for(;;) {
-        c = getc(f);
-        if (c == 0) {
-          /* Append the right number of NULs	*/
-          /* Note that any string of NULs is rpresented in 4 words,	*/
-          /* independent of its length.					*/
-            register size_t count = 1;
-            
-            CORD_ec_flush_buf(ecord);
-            while ((c = getc(f)) == 0) count++;
-            ecord[0].ec_cord = CORD_cat(ecord[0].ec_cord, CORD_nul(count));
-        }
-        if (c == EOF) break;
-        CORD_ec_append(ecord, c);
-    }
-    (void) fclose(f);
-    return(CORD_balance(CORD_ec_to_cord(ecord)));
-}
-
-/* The state maintained for a lazily read file consists primarily	*/
-/* of a large direct-mapped cache of previously read values.		*/
-/* We could rely more on stdio buffering.  That would have 2		*/
-/* disadvantages:							*/
-/*  	1) Empirically, not all fseek implementations preserve the	*/
-/*	   buffer whenever they could.					*/
-/*	2) It would fail if 2 different sections of a long cord		*/
-/*	   were being read alternately.					*/
-/* We do use the stdio buffer for read ahead.				*/
-/* To guarantee thread safety in the presence of atomic pointer		*/
-/* writes, cache lines are always replaced, and never modified in	*/
-/* place.								*/
-
-# define LOG_CACHE_SZ 14
-# define CACHE_SZ (1 << LOG_CACHE_SZ)
-# define LOG_LINE_SZ 9
-# define LINE_SZ (1 << LOG_LINE_SZ)
-
-typedef struct {
-    size_t tag;
-    char data[LINE_SZ];
-    	/* data[i%LINE_SZ] = ith char in file if tag = i/LINE_SZ	*/
-} cache_line;
-
-typedef struct {
-    FILE * lf_file;
-    size_t lf_current;	/* Current file pointer value */
-    cache_line * volatile lf_cache[CACHE_SZ/LINE_SZ];
-} lf_state;
-
-# define MOD_CACHE_SZ(n) ((n) & (CACHE_SZ - 1))
-# define DIV_CACHE_SZ(n) ((n) >> LOG_CACHE_SZ)
-# define MOD_LINE_SZ(n) ((n) & (LINE_SZ - 1))
-# define DIV_LINE_SZ(n) ((n) >> LOG_LINE_SZ)
-# define LINE_START(n) ((n) & ~(LINE_SZ - 1))
-
-typedef struct {
-    lf_state * state;
-    size_t file_pos;	/* Position of needed character. */
-    cache_line * new_cache;
-} refill_data;
-
-/* Executed with allocation lock. */
-static char refill_cache(client_data)
-refill_data * client_data;
-{
-    register lf_state * state = client_data -> state;
-    register size_t file_pos = client_data -> file_pos;
-    FILE *f = state -> lf_file;
-    size_t line_start = LINE_START(file_pos);
-    size_t line_no = DIV_LINE_SZ(MOD_CACHE_SZ(file_pos));
-    cache_line * new_cache = client_data -> new_cache;
-    
-    if (line_start != state -> lf_current
-        && fseek(f, line_start, SEEK_SET) != 0) {
-    	    ABORT("fseek failed");
-    }
-    if (fread(new_cache -> data, sizeof(char), LINE_SZ, f)
-    	<= file_pos - line_start) {
-    	ABORT("fread failed");
-    }
-    new_cache -> tag = DIV_LINE_SZ(file_pos);
-    /* Store barrier goes here. */
-    ATOMIC_WRITE(state -> lf_cache[line_no], new_cache);
-    state -> lf_current = line_start + LINE_SZ;
-    return(new_cache->data[MOD_LINE_SZ(file_pos)]);
-}
-
-char CORD_lf_func(size_t i, void * client_data)
-{
-    register lf_state * state = (lf_state *)client_data;
-    register cache_line * volatile * cl_addr =
-		&(state -> lf_cache[DIV_LINE_SZ(MOD_CACHE_SZ(i))]);
-    register cache_line * cl = (cache_line *)ATOMIC_READ(cl_addr);
-    
-    if (cl == 0 || cl -> tag != DIV_LINE_SZ(i)) {
-    	/* Cache miss */
-    	refill_data rd;
-    	
-        rd.state = state;
-        rd.file_pos =  i;
-        rd.new_cache = GC_NEW_ATOMIC(cache_line);
-        if (rd.new_cache == 0) OUT_OF_MEMORY;
-        return((char)(GC_word)
-        	  GC_call_with_alloc_lock((GC_fn_type) refill_cache, &rd));
-    }
-    return(cl -> data[MOD_LINE_SZ(i)]);
-}    
-
-/*ARGSUSED*/
-void CORD_lf_close_proc(void * obj, void * client_data)  
-{
-    if (fclose(((lf_state *)obj) -> lf_file) != 0) {
-    	ABORT("CORD_lf_close_proc: fclose failed");
-    }
-}			
-
-CORD CORD_from_file_lazy_inner(FILE * f, size_t len)
-{
-    register lf_state * state = GC_NEW(lf_state);
-    register int i;
-    
-    if (state == 0) OUT_OF_MEMORY;
-    if (len != 0) {
-	/* Dummy read to force buffer allocation.  	*/
-	/* This greatly increases the probability	*/
-	/* of avoiding deadlock if buffer allocation	*/
-	/* is redirected to GC_malloc and the		*/
-	/* world is multithreaded.			*/
-	char buf[1];
-
-	(void) fread(buf, 1, 1, f); 
-	rewind(f);
-    }
-    state -> lf_file = f;
-    for (i = 0; i < CACHE_SZ/LINE_SZ; i++) {
-        state -> lf_cache[i] = 0;
-    }
-    state -> lf_current = 0;
-    GC_REGISTER_FINALIZER(state, CORD_lf_close_proc, 0, 0, 0);
-    return(CORD_from_fn(CORD_lf_func, state, len));
-}
-
-CORD CORD_from_file_lazy(FILE * f)
-{
-    register long len;
-    
-    if (fseek(f, 0l, SEEK_END) != 0) {
-        ABORT("Bad fd argument - fseek failed");
-    }
-    if ((len = ftell(f)) < 0) {
-        ABORT("Bad fd argument - ftell failed");
-    }
-    rewind(f);
-    return(CORD_from_file_lazy_inner(f, (size_t)len));
-}
-
-# define LAZY_THRESHOLD (128*1024 + 1)
-
-CORD CORD_from_file(FILE * f)
-{
-    register long len;
-    
-    if (fseek(f, 0l, SEEK_END) != 0) {
-        ABORT("Bad fd argument - fseek failed");
-    }
-    if ((len = ftell(f)) < 0) {
-        ABORT("Bad fd argument - ftell failed");
-    }
-    rewind(f);
-    if (len < LAZY_THRESHOLD) {
-        return(CORD_from_file_eager(f));
-    } else {
-        return(CORD_from_file_lazy_inner(f, (size_t)len));
-    }
-}
diff --git a/boehm-gc/cord/de.c b/boehm-gc/cord/de.c
deleted file mode 100644
index 989e19a8881..00000000000
--- a/boehm-gc/cord/de.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Author: Hans-J. Boehm (boehm@parc.xerox.com)
- */
-/*
- * A really simple-minded text editor based on cords.
- * Things it does right:
- * 	No size bounds.
- *	Inbounded undo.
- *	Shouldn't crash no matter what file you invoke it on (e.g. /vmunix)
- *		(Make sure /vmunix is not writable before you try this.)
- *	Scrolls horizontally.
- * Things it does wrong:
- *	It doesn't handle tabs reasonably (use "expand" first).
- *	The command set is MUCH too small.
- *	The redisplay algorithm doesn't let curses do the scrolling.
- *	The rule for moving the window over the file is suboptimal.
- */
-/* Boehm, February 6, 1995 12:27 pm PST */
-
-/* Boehm, May 19, 1994 2:20 pm PDT */
-#include <stdio.h>
-#include "gc.h"
-#include "cord.h"
-
-#ifdef THINK_C
-#define MACINTOSH
-#include <ctype.h>
-#endif
-
-#if defined(__BORLANDC__) && !defined(WIN32)
-    /* If this is DOS or win16, we'll fail anyway.	*/
-    /* Might as well assume win32.			*/
-#   define WIN32
-#endif
-
-#if defined(WIN32)
-#  include <windows.h>
-#  include "de_win.h"
-#elif defined(MACINTOSH)
-#	include <console.h>
-/* curses emulation. */
-#	define initscr()
-#	define endwin()
-#	define nonl()
-#	define noecho() csetmode(C_NOECHO, stdout)
-#	define cbreak() csetmode(C_CBREAK, stdout)
-#	define refresh()
-#	define addch(c) putchar(c)
-#	define standout() cinverse(1, stdout)
-#	define standend() cinverse(0, stdout)
-#	define move(line,col) cgotoxy(col + 1, line + 1, stdout)
-#	define clrtoeol() ccleol(stdout)
-#	define de_error(s) { fprintf(stderr, s); getchar(); }
-#	define LINES 25
-#	define COLS 80
-#else
-#  include <curses.h>
-#  define de_error(s) { fprintf(stderr, s); sleep(2); }
-#endif
-#include "de_cmds.h"
-
-/* List of line number to position mappings, in descending order. */
-/* There may be holes.						  */
-typedef struct LineMapRep {
-    int line;
-    size_t pos;
-    struct LineMapRep * previous;
-} * line_map;
-
-/* List of file versions, one per edit operation */
-typedef struct HistoryRep {
-    CORD file_contents;
-    struct HistoryRep * previous;
-    line_map map;	/* Invalid for first record "now" */
-} * history;
-
-history now = 0;
-CORD current;		/* == now -> file_contents.	*/
-size_t current_len;	/* Current file length.		*/
-line_map current_map = 0;	/* Current line no. to pos. map	 */
-size_t current_map_size = 0;	/* Number of current_map entries.	*/
-				/* Not always accurate, but reset	*/
-				/* by prune_map.			*/
-# define MAX_MAP_SIZE 3000
-
-/* Current display position */
-int dis_line = 0;
-int dis_col = 0;
-
-# define ALL -1
-# define NONE - 2
-int need_redisplay = 0;	/* Line that needs to be redisplayed.	*/
-
-
-/* Current cursor position. Always within file. */
-int line = 0; 
-int col = 0;
-size_t file_pos = 0;	/* Character position corresponding to cursor.	*/
-
-/* Invalidate line map for lines > i */
-void invalidate_map(int i)
-{
-    while(current_map -> line > i) {
-        current_map = current_map -> previous;
-        current_map_size--;
-    }
-}
-
-/* Reduce the number of map entries to save space for huge files. */
-/* This also affects maps in histories.				  */
-void prune_map()
-{
-    line_map map = current_map;
-    int start_line = map -> line;
-    
-    current_map_size = 0;
-    for(; map != 0; map = map -> previous) {
-    	current_map_size++;
-    	if (map -> line < start_line - LINES && map -> previous != 0) {
-    	    map -> previous = map -> previous -> previous;
-    	}
-    }
-}
-/* Add mapping entry */
-void add_map(int line, size_t pos)
-{
-    line_map new_map = GC_NEW(struct LineMapRep);
-    
-    if (current_map_size >= MAX_MAP_SIZE) prune_map();
-    new_map -> line = line;
-    new_map -> pos = pos;
-    new_map -> previous = current_map;
-    current_map = new_map;
-    current_map_size++;
-}
-
-
-
-/* Return position of column *c of ith line in   */
-/* current file. Adjust *c to be within the line.*/
-/* A 0 pointer is taken as 0 column.		 */
-/* Returns CORD_NOT_FOUND if i is too big.	 */
-/* Assumes i > dis_line.			 */
-size_t line_pos(int i, int *c)
-{
-    int j;
-    size_t cur;
-    size_t next;
-    line_map map = current_map;
-    
-    while (map -> line > i) map = map -> previous;
-    if (map -> line < i - 2) /* rebuild */ invalidate_map(i);
-    for (j = map -> line, cur = map -> pos; j < i;) {
-	cur = CORD_chr(current, cur, '\n');
-        if (cur == current_len-1) return(CORD_NOT_FOUND);
-        cur++;
-        if (++j > current_map -> line) add_map(j, cur);
-    }
-    if (c != 0) {
-        next = CORD_chr(current, cur, '\n');
-        if (next == CORD_NOT_FOUND) next = current_len - 1;
-        if (next < cur + *c) {
-            *c = next - cur;
-        }
-        cur += *c;
-    }
-    return(cur);
-}
-
-void add_hist(CORD s)
-{
-    history new_file = GC_NEW(struct HistoryRep);
-    
-    new_file -> file_contents = current = s;
-    current_len = CORD_len(s);
-    new_file -> previous = now;
-    if (now != 0) now -> map = current_map;
-    now = new_file;
-}
-
-void del_hist(void)
-{
-    now = now -> previous;
-    current = now -> file_contents;
-    current_map = now -> map;
-    current_len = CORD_len(current);
-}
-
-/* Current screen_contents; a dynamically allocated array of CORDs	*/
-CORD * screen = 0;
-int screen_size = 0;
-
-# ifndef WIN32
-/* Replace a line in the curses stdscr.	All control characters are	*/
-/* displayed as upper case characters in standout mode.  This isn't	*/
-/* terribly appropriate for tabs.									*/
-void replace_line(int i, CORD s)
-{
-    register int c;
-    CORD_pos p;
-    size_t len = CORD_len(s);
-    
-    if (screen == 0 || LINES > screen_size) {
-        screen_size = LINES;
-    	screen = (CORD *)GC_MALLOC(screen_size * sizeof(CORD));
-    }
-#   if !defined(MACINTOSH)
-        /* A gross workaround for an apparent curses bug: */
-        if (i == LINES-1 && len == COLS) {
-            s = CORD_substr(s, 0, CORD_len(s) - 1);
-        }
-#   endif
-    if (CORD_cmp(screen[i], s) != 0) {
-        move(i, 0); clrtoeol(); move(i,0);
-
-        CORD_FOR (p, s) {
-            c = CORD_pos_fetch(p) & 0x7f;
-            if (iscntrl(c)) {
-            	standout(); addch(c + 0x40); standend();
-            } else {
-    	        addch(c);
-    	    }
-    	}
-    	screen[i] = s;
-    }
-}
-#else
-# define replace_line(i,s) invalidate_line(i)
-#endif
-
-/* Return up to COLS characters of the line of s starting at pos,	*/
-/* returning only characters after the given column.			*/
-CORD retrieve_line(CORD s, size_t pos, unsigned column)
-{
-    CORD candidate = CORD_substr(s, pos, column + COLS);
-    			/* avoids scanning very long lines	*/
-    int eol = CORD_chr(candidate, 0, '\n');
-    int len;
-    
-    if (eol == CORD_NOT_FOUND) eol = CORD_len(candidate);
-    len = (int)eol - (int)column;
-    if (len < 0) len = 0;
-    return(CORD_substr(s, pos + column, len));
-}
-
-# ifdef WIN32
-#   define refresh();
-
-    CORD retrieve_screen_line(int i)
-    {
-    	register size_t pos;
-    	
-    	invalidate_map(dis_line + LINES);	/* Prune search */
-    	pos = line_pos(dis_line + i, 0);
-    	if (pos == CORD_NOT_FOUND) return(CORD_EMPTY);
-    	return(retrieve_line(current, pos, dis_col));
-    }
-# endif
-
-/* Display the visible section of the current file	 */
-void redisplay(void)
-{
-    register int i;
-    
-    invalidate_map(dis_line + LINES);	/* Prune search */
-    for (i = 0; i < LINES; i++) {
-        if (need_redisplay == ALL || need_redisplay == i) {
-            register size_t pos = line_pos(dis_line + i, 0);
-            
-            if (pos == CORD_NOT_FOUND) break;
-            replace_line(i, retrieve_line(current, pos, dis_col));
-            if (need_redisplay == i) goto done;
-        }
-    }
-    for (; i < LINES; i++) replace_line(i, CORD_EMPTY);
-done:
-    refresh();
-    need_redisplay = NONE;
-}
-
-int dis_granularity;
-
-/* Update dis_line, dis_col, and dis_pos to make cursor visible.	*/
-/* Assumes line, col, dis_line, dis_pos are in bounds.			*/
-void normalize_display()
-{
-    int old_line = dis_line;
-    int old_col = dis_col;
-    
-    dis_granularity = 1;
-    if (LINES > 15 && COLS > 15) dis_granularity = 2;
-    while (dis_line > line) dis_line -= dis_granularity;
-    while (dis_col > col) dis_col -= dis_granularity;
-    while (line >= dis_line + LINES) dis_line += dis_granularity;
-    while (col >= dis_col + COLS) dis_col += dis_granularity;
-    if (old_line != dis_line || old_col != dis_col) {
-        need_redisplay = ALL;
-    }
-}
-
-# if defined(WIN32)
-# elif defined(MACINTOSH)
-#		define move_cursor(x,y) cgotoxy(x + 1, y + 1, stdout)
-# else
-#		define move_cursor(x,y) move(y,x)
-# endif
-
-/* Adjust display so that cursor is visible; move cursor into position	*/
-/* Update screen if necessary.						*/
-void fix_cursor(void)
-{
-    normalize_display();
-    if (need_redisplay != NONE) redisplay();
-    move_cursor(col - dis_col, line - dis_line);
-    refresh();
-#   ifndef WIN32
-      fflush(stdout);
-#   endif
-}
-
-/* Make sure line, col, and dis_pos are somewhere inside file.	*/
-/* Recompute file_pos.	Assumes dis_pos is accurate or past eof	*/
-void fix_pos()
-{
-    int my_col = col;
-    
-    if ((size_t)line > current_len) line = current_len;
-    file_pos = line_pos(line, &my_col);
-    if (file_pos == CORD_NOT_FOUND) {
-        for (line = current_map -> line, file_pos = current_map -> pos;
-             file_pos < current_len;
-             line++, file_pos = CORD_chr(current, file_pos, '\n') + 1);
-    	line--;
-        file_pos = line_pos(line, &col);
-    } else {
-    	col = my_col;
-    }
-}
-
-#if defined(WIN32)
-#  define beep() Beep(1000 /* Hz */, 300 /* msecs */) 
-#elif defined(MACINTOSH)
-#	define beep() SysBeep(1)
-#else
-/*
- * beep() is part of some curses packages and not others.
- * We try to match the type of the builtin one, if any.
- */
-#ifdef __STDC__
-    int beep(void)
-#else
-    int beep()
-#endif
-{
-    putc('\007', stderr);
-    return(0);
-}
-#endif
-
-#   define NO_PREFIX -1
-#   define BARE_PREFIX -2
-int repeat_count = NO_PREFIX;	/* Current command prefix. */
-
-int locate_mode = 0;			/* Currently between 2 ^Ls	*/
-CORD locate_string = CORD_EMPTY;	/* Current search string.	*/
-
-char * arg_file_name;
-
-#ifdef WIN32
-/* Change the current position to whatever is currently displayed at	*/
-/* the given SCREEN coordinates.					*/
-void set_position(int c, int l)
-{
-    line = l + dis_line;
-    col = c + dis_col;
-    fix_pos();
-    move_cursor(col - dis_col, line - dis_line);
-}
-#endif /* WIN32 */
-
-/* Perform the command associated with character c.  C may be an	*/
-/* integer > 256 denoting a windows command, one of the above control	*/
-/* characters, or another ASCII character to be used as either a 	*/
-/* character to be inserted, a repeat count, or a search string, 	*/
-/* depending on the current state.					*/
-void do_command(int c)
-{
-    int i;
-    int need_fix_pos;
-    FILE * out;
-    
-    if ( c == '\r') c = '\n';
-    if (locate_mode) {
-        size_t new_pos;
-          
-        if (c == LOCATE) {
-              locate_mode = 0;
-              locate_string = CORD_EMPTY;
-              return;
-        }
-        locate_string = CORD_cat_char(locate_string, (char)c);
-        new_pos = CORD_str(current, file_pos - CORD_len(locate_string) + 1,
-          		   locate_string);
-        if (new_pos != CORD_NOT_FOUND) {
-            need_redisplay = ALL;
-            new_pos += CORD_len(locate_string);
-            for (;;) {
-              	file_pos = line_pos(line + 1, 0);
-              	if (file_pos > new_pos) break;
-              	line++;
-            }
-            col = new_pos - line_pos(line, 0);
-            file_pos = new_pos;
-            fix_cursor();
-        } else {
-            locate_string = CORD_substr(locate_string, 0,
-              				CORD_len(locate_string) - 1);
-            beep();
-        }
-        return;
-    }
-    if (c == REPEAT) {
-      	repeat_count = BARE_PREFIX; return;
-    } else if (c < 0x100 && isdigit(c)){
-        if (repeat_count == BARE_PREFIX) {
-          repeat_count = c - '0'; return;
-        } else if (repeat_count != NO_PREFIX) {
-          repeat_count = 10 * repeat_count + c - '0'; return;
-        }
-    }
-    if (repeat_count == NO_PREFIX) repeat_count = 1;
-    if (repeat_count == BARE_PREFIX && (c == UP || c == DOWN)) {
-      	repeat_count = LINES - dis_granularity;
-    }
-    if (repeat_count == BARE_PREFIX) repeat_count = 8;
-    need_fix_pos = 0;
-    for (i = 0; i < repeat_count; i++) {
-        switch(c) {
-          case LOCATE:
-            locate_mode = 1;
-            break;
-          case TOP:
-            line = col = file_pos = 0;
-            break;
-     	  case UP:
-     	    if (line != 0) {
-     	        line--;
-     	        need_fix_pos = 1;
-     	    }
-     	    break;
-     	  case DOWN:
-     	    line++;
-     	    need_fix_pos = 1;
-     	    break;
-     	  case LEFT:
-     	    if (col != 0) {
-     	        col--; file_pos--;
-     	    }
-     	    break;
-     	  case RIGHT:
-     	    if (CORD_fetch(current, file_pos) == '\n') break;
-     	    col++; file_pos++;
-     	    break;
-     	  case UNDO:
-     	    del_hist();
-     	    need_redisplay = ALL; need_fix_pos = 1;
-     	    break;
-     	  case BS:
-     	    if (col == 0) {
-     	        beep();
-     	        break;
-     	    }
-     	    col--; file_pos--;
-     	    /* fall through: */
-     	  case DEL:
-     	    if (file_pos == current_len-1) break;
-     	    	/* Can't delete trailing newline */
-     	    if (CORD_fetch(current, file_pos) == '\n') {
-     	        need_redisplay = ALL; need_fix_pos = 1;
-     	    } else {
-     	        need_redisplay = line - dis_line;
-     	    }
-     	    add_hist(CORD_cat(
-     	    		CORD_substr(current, 0, file_pos),
-     	    		CORD_substr(current, file_pos+1, current_len)));
-     	    invalidate_map(line);
-     	    break;
-     	  case WRITE:
-	    {
-  		CORD name = CORD_cat(CORD_from_char_star(arg_file_name),
-				     ".new");
-
-    	        if ((out = fopen(CORD_to_const_char_star(name), "wb")) == NULL
-  	            || CORD_put(current, out) == EOF) {
-        	    de_error("Write failed\n");
-        	    need_redisplay = ALL;
-                } else {
-                    fclose(out);
-                }
-	    }
-            break;
-     	  default:
-     	    {
-     	        CORD left_part = CORD_substr(current, 0, file_pos);
-     	        CORD right_part = CORD_substr(current, file_pos, current_len);
-     	        
-     	        add_hist(CORD_cat(CORD_cat_char(left_part, (char)c),
-     	        		  right_part));
-     	        invalidate_map(line);
-     	        if (c == '\n') {
-     	            col = 0; line++; file_pos++;
-     	            need_redisplay = ALL;
-     	        } else {
-     	            col++; file_pos++;
-     	            need_redisplay = line - dis_line;
-     	    	}
-     	        break;
-     	    }
-        }
-    }
-    if (need_fix_pos) fix_pos();
-    fix_cursor();
-    repeat_count = NO_PREFIX;
-}
-
-/* OS independent initialization */
-
-void generic_init(void)
-{
-    FILE * f;
-    CORD initial;
-    
-    if ((f = fopen(arg_file_name, "rb")) == NULL) {
-     	initial = "\n";
-    } else {
-        initial = CORD_from_file(f);
-        if (initial == CORD_EMPTY
-            || CORD_fetch(initial, CORD_len(initial)-1) != '\n') {
-            initial = CORD_cat(initial, "\n");
-        }
-    }
-    add_map(0,0);
-    add_hist(initial);
-    now -> map = current_map;
-    now -> previous = now;  /* Can't back up further: beginning of the world */
-    need_redisplay = ALL;
-    fix_cursor();
-}
-
-#ifndef WIN32
-
-main(argc, argv)
-int argc;
-char ** argv;
-{
-    int c;
-
-#if defined(MACINTOSH)
-	console_options.title = "\pDumb Editor";
-	cshow(stdout);
-	argc = ccommand(&argv);
-#endif
-    GC_INIT();
-    
-    if (argc != 2) goto usage;
-    arg_file_name = argv[1];
-    setvbuf(stdout, GC_MALLOC_ATOMIC(8192), _IOFBF, 8192);
-    initscr();
-    noecho(); nonl(); cbreak();
-    generic_init();
-    while ((c = getchar()) != QUIT) {
-		if (c == EOF) break;
-	    do_command(c);
-    }
-done:
-    move(LINES-1, 0);
-    clrtoeol();
-    refresh();
-    nl();
-    echo();
-    endwin();
-    exit(0);
-usage:
-    fprintf(stderr, "Usage: %s file\n", argv[0]);
-    fprintf(stderr, "Cursor keys: ^B(left) ^F(right) ^P(up) ^N(down)\n");
-    fprintf(stderr, "Undo: ^U    Write to <file>.new: ^W");
-    fprintf(stderr, "Quit:^D  Repeat count: ^R[n]\n");
-    fprintf(stderr, "Top: ^T   Locate (search, find): ^L text ^L\n");
-    exit(1);
-}
-
-#endif  /* !WIN32 */
diff --git a/boehm-gc/cord/de_cmds.h b/boehm-gc/cord/de_cmds.h
deleted file mode 100644
index f42ddcf2da7..00000000000
--- a/boehm-gc/cord/de_cmds.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, May 19, 1994 2:24 pm PDT */
-
-#ifndef DE_CMDS_H
-
-# define DE_CMDS_H
-
-# define UP     16	/* ^P */
-# define DOWN   14	/* ^N */
-# define LEFT   2	/* ^B */
-# define RIGHT  6	/* ^F */
-# define DEL	127	/* ^? */
-# define BS     8	/* ^H */
-# define UNDO   21	/* ^U */
-# define WRITE  23	/* ^W */
-# define QUIT   4	/* ^D */
-# define REPEAT 18	/* ^R */
-# define LOCATE 12	/* ^L */
-# define TOP    20	/* ^T */
-
-#endif
-
diff --git a/boehm-gc/cord/de_win.ICO b/boehm-gc/cord/de_win.ICO
deleted file mode 100755
index b20ac3ee16a..00000000000
--- a/boehm-gc/cord/de_win.ICO
+++ /dev/null
diff --git a/boehm-gc/cord/de_win.RC b/boehm-gc/cord/de_win.RC
deleted file mode 100644
index 554a3004389..00000000000
--- a/boehm-gc/cord/de_win.RC
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to copy this garbage collector for any purpose,
- * provided the above notices are retained on all copies.
- */
-/* Boehm, May 13, 1994 9:50 am PDT */
-
-#include "windows.h"
-#include "de_cmds.h"
-#include "de_win.h"
-
-
-
-ABOUTBOX DIALOG 19, 21, 163, 47
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About Demonstration Text Editor"
-BEGIN
-	ICON "DE", -1, 8, 8, 13, 13, WS_CHILD | WS_VISIBLE
-	LTEXT "Demonstration Text Editor", -1, 44, 8, 118, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "Version 4.1", -1, 44, 16, 60, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
-	PUSHBUTTON "OK", IDOK, 118, 27, 24, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-
-DE MENU 
-BEGIN
-	POPUP "&File"
-	BEGIN
-		MENUITEM "&Save\t^W", IDM_FILESAVE
-		MENUITEM "E&xit\t^D", IDM_FILEEXIT
-	END
-
-	POPUP "&Edit"
-	BEGIN
-	    MENUITEM "Page &Down\t^R^N", IDM_EDITPDOWN
-	    MENUITEM "Page &Up\t^R^P", IDM_EDITPUP
-		MENUITEM "U&ndo\t^U", IDM_EDITUNDO
-		MENUITEM "&Locate\t^L ... ^L", IDM_EDITLOCATE
-		MENUITEM "D&own\t^N", IDM_EDITDOWN
-	    MENUITEM "U&p\t^P", IDM_EDITUP
-	    MENUITEM "Le&ft\t^B", IDM_EDITLEFT
-	    MENUITEM "&Right\t^F", IDM_EDITRIGHT
-	    MENUITEM "Delete &Backward\tBS", IDM_EDITBS
-	    MENUITEM "Delete F&orward\tDEL", IDM_EDITDEL
-	    MENUITEM "&Top\t^T", IDM_EDITTOP
-	END
-	
-	POPUP "&Help"
-	BEGIN
-		MENUITEM "&Contents", IDM_HELPCONTENTS
-		MENUITEM "&About...", IDM_HELPABOUT
-	END
-	
-	MENUITEM "Page_&Down", IDM_EDITPDOWN
-	MENUITEM "Page_&Up", IDM_EDITPUP
-END
-
-
-DE ACCELERATORS 
-BEGIN
-    "^R", IDM_EDITREPEAT
-    "^N", IDM_EDITDOWN
-    "^P", IDM_EDITUP
-    "^L", IDM_EDITLOCATE
-    "^B", IDM_EDITLEFT
-    "^F", IDM_EDITRIGHT
-    "^T", IDM_EDITTOP
-	VK_DELETE, IDM_EDITDEL, VIRTKEY
-	VK_BACK, IDM_EDITBS, VIRTKEY
-END
-
-
-DE ICON cord\de_win.ICO
-
diff --git a/boehm-gc/cord/de_win.c b/boehm-gc/cord/de_win.c
deleted file mode 100644
index 0bbd676a335..00000000000
--- a/boehm-gc/cord/de_win.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, February 6, 1995 12:29 pm PST */
-
-/*
- * The MS Windows specific part of de.  
- * This started as the generic Windows application template
- * made available by Rob Haack (rhaack@polaris.unm.edu), but
- * significant parts didn't survive to the final version.
- *
- * This was written by a nonexpert windows programmer.
- */
-
-
-#include "windows.h"
-#include "gc.h"
-#include "cord.h"
-#include "de_cmds.h"
-#include "de_win.h"
-
-int LINES = 0;
-int COLS = 0;
-
-char       szAppName[]     = "DE";
-char       FullAppName[]   = "Demonstration Editor";
-
-HWND        hwnd;
-
-void de_error(char *s)
-{
-    MessageBox( hwnd, (LPSTR) s,
-                (LPSTR) FullAppName,
-                MB_ICONINFORMATION | MB_OK );
-    InvalidateRect(hwnd, NULL, TRUE);
-}
-
-int APIENTRY WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
-                      LPSTR command_line, int nCmdShow)
-{
-   MSG         msg;
-   WNDCLASS    wndclass;
-   HANDLE      hAccel;
-
-   if (!hPrevInstance)
-   {
-      wndclass.style          = CS_HREDRAW | CS_VREDRAW;
-      wndclass.lpfnWndProc    = WndProc;
-      wndclass.cbClsExtra     = 0;
-      wndclass.cbWndExtra     = DLGWINDOWEXTRA;
-      wndclass.hInstance      = hInstance;
-      wndclass.hIcon          = LoadIcon (hInstance, szAppName);
-      wndclass.hCursor        = LoadCursor (NULL, IDC_ARROW);
-      wndclass.hbrBackground  = GetStockObject(WHITE_BRUSH);
-      wndclass.lpszMenuName   = "DE";
-      wndclass.lpszClassName  = szAppName;
-
-      if (RegisterClass (&wndclass) == 0) {
-          char buf[50];
-   	
-   	  sprintf(buf, "RegisterClass: error code: 0x%X", GetLastError());
-   	  de_error(buf);
-   	  return(0);
-      }
-   }
-   
-   /* Empirically, the command line does not include the command name ...
-   if (command_line != 0) {
-       while (isspace(*command_line)) command_line++;
-       while (*command_line != 0 && !isspace(*command_line)) command_line++;
-       while (isspace(*command_line)) command_line++;
-   } */
-   
-   if (command_line == 0 || *command_line == 0) {
-        de_error("File name argument required");
-        return( 0 );
-   } else {
-        char *p = command_line;
-        
-        while (*p != 0 && !isspace(*p)) p++;
-   	arg_file_name = CORD_to_char_star(
-   			    CORD_substr(command_line, 0, p - command_line));
-   }
-
-   hwnd = CreateWindow (szAppName,
-   			FullAppName,
-   			WS_OVERLAPPEDWINDOW | WS_CAPTION, /* Window style */
-   			CW_USEDEFAULT, 0, /* default pos. */
-   			CW_USEDEFAULT, 0, /* default width, height */
-   			NULL,	/* No parent */
-   			NULL, 	/* Window class menu */
-   			hInstance, NULL);
-   if (hwnd == NULL) {
-   	char buf[50];
-   	
-   	sprintf(buf, "CreateWindow: error code: 0x%X", GetLastError());
-   	de_error(buf);
-   	return(0);
-   }
-
-   ShowWindow (hwnd, nCmdShow);
-
-   hAccel = LoadAccelerators( hInstance, szAppName );
-   
-   while (GetMessage (&msg, NULL, 0, 0))
-   {
-      if( !TranslateAccelerator( hwnd, hAccel, &msg ) )
-      {
-         TranslateMessage (&msg);
-         DispatchMessage (&msg);
-      }
-   }
-   return msg.wParam;
-}
-
-/* Return the argument with all control characters replaced by blanks.	*/
-char * plain_chars(char * text, size_t len)
-{
-    char * result = GC_MALLOC_ATOMIC(len + 1);
-    register size_t i;
-    
-    for (i = 0; i < len; i++) {
-       if (iscntrl(text[i])) {
-           result[i] = ' ';
-       } else {
-           result[i] = text[i];
-       }
-    }
-    result[len] = '\0';
-    return(result);
-}
-
-/* Return the argument with all non-control-characters replaced by 	*/
-/* blank, and all control characters c replaced by c + 32.		*/
-char * control_chars(char * text, size_t len)
-{
-    char * result = GC_MALLOC_ATOMIC(len + 1);
-    register size_t i;
-    
-    for (i = 0; i < len; i++) {
-       if (iscntrl(text[i])) {
-           result[i] = text[i] + 0x40;
-       } else {
-           result[i] = ' ';
-       }
-    }
-    result[len] = '\0';
-    return(result);
-}
-
-int char_width;
-int char_height;
-
-void get_line_rect(int line, int win_width, RECT * rectp)
-{
-    rectp -> top = line * char_height;
-    rectp -> bottom = rectp->top + char_height;
-    rectp -> left = 0;
-    rectp -> right = win_width;
-}
-
-int caret_visible = 0;	/* Caret is currently visible.	*/
-
-int screen_was_painted = 0;/* Screen has been painted at least once.	*/
-
-void update_cursor(void);
-
-LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
-                          WPARAM wParam, LPARAM lParam)
-{
-   static FARPROC lpfnAboutBox;
-   static HANDLE  hInstance;
-   HDC dc;
-   PAINTSTRUCT ps;
-   RECT client_area;
-   RECT this_line;
-   RECT dummy;
-   TEXTMETRIC tm;
-   register int i;
-   int id;
-
-   switch (message)
-   {
-      case WM_CREATE:
-           hInstance = ( (LPCREATESTRUCT) lParam)->hInstance;
-           lpfnAboutBox = MakeProcInstance( (FARPROC) AboutBox, hInstance );
-           dc = GetDC(hwnd);
-           SelectObject(dc, GetStockObject(SYSTEM_FIXED_FONT));
-           GetTextMetrics(dc, &tm);
-           ReleaseDC(hwnd, dc);
-           char_width = tm.tmAveCharWidth;
-           char_height = tm.tmHeight + tm.tmExternalLeading;
-           GetClientRect(hwnd, &client_area);
-      	   COLS = (client_area.right - client_area.left)/char_width;
-      	   LINES = (client_area.bottom - client_area.top)/char_height;
-      	   generic_init();
-           return(0);
-
-      case WM_CHAR:
-      	   if (wParam == QUIT) {
-      	       SendMessage( hwnd, WM_CLOSE, 0, 0L );
-      	   } else {
-      	       do_command(wParam);
-      	   }
-      	   return(0);
-      
-      case WM_SETFOCUS:
-      	   CreateCaret(hwnd, NULL, char_width, char_height);
-      	   ShowCaret(hwnd);
-      	   caret_visible = 1;
-      	   update_cursor();
-      	   return(0);
-      	   
-      case WM_KILLFOCUS:
-      	   HideCaret(hwnd);
-      	   DestroyCaret();
-      	   caret_visible = 0;
-      	   return(0);
-      	   
-      case WM_LBUTTONUP:
-      	   {
-      	       unsigned xpos = LOWORD(lParam);	/* From left	*/
-      	       unsigned ypos = HIWORD(lParam);	/* from top */
-      	       
-      	       set_position( xpos/char_width, ypos/char_height );
-      	       return(0);
-      	   }
-      	   
-      case WM_COMMAND:
-      	   id = LOWORD(wParam);
-      	   if (id & EDIT_CMD_FLAG) {
-               if (id & REPEAT_FLAG) do_command(REPEAT);
-               do_command(CHAR_CMD(id));
-               return( 0 );
-           } else {
-             switch(id) {
-               case IDM_FILEEXIT:
-                  SendMessage( hwnd, WM_CLOSE, 0, 0L );
-                  return( 0 );
-
-               case IDM_HELPABOUT:
-                  if( DialogBox( hInstance, "ABOUTBOX",
-                                 hwnd, lpfnAboutBox ) )
-                     InvalidateRect( hwnd, NULL, TRUE );
-                  return( 0 );
-	       case IDM_HELPCONTENTS:
-	     	  de_error(
-	     	       "Cursor keys: ^B(left) ^F(right) ^P(up) ^N(down)\n"
-	     	       "Undo: ^U    Write: ^W   Quit:^D  Repeat count: ^R[n]\n"
-	     	       "Top: ^T   Locate (search, find): ^L text ^L\n");
-	     	  return( 0 );
-	     }
-	   }
-           break;
-
-      case WM_CLOSE:
-           DestroyWindow( hwnd );
-           return 0;
-
-      case WM_DESTROY:
-           PostQuitMessage (0);
-	   GC_win32_free_heap();
-           return 0;
-      
-      case WM_PAINT:
-      	   dc = BeginPaint(hwnd, &ps);
-      	   GetClientRect(hwnd, &client_area);
-      	   COLS = (client_area.right - client_area.left)/char_width;
-      	   LINES = (client_area.bottom - client_area.top)/char_height;
-      	   SelectObject(dc, GetStockObject(SYSTEM_FIXED_FONT));
-      	   for (i = 0; i < LINES; i++) {
-      	       get_line_rect(i, client_area.right, &this_line);
-      	       if (IntersectRect(&dummy, &this_line, &ps.rcPaint)) {
-      	           CORD raw_line = retrieve_screen_line(i);
-      	           size_t len = CORD_len(raw_line);
-      	           char * text = CORD_to_char_star(raw_line);
-      	           		/* May contain embedded NULLs	*/
-      	           char * plain = plain_chars(text, len);
-      	           char * blanks = CORD_to_char_star(CORD_chars(' ',
-      	           				                COLS - len));
-      	           char * control = control_chars(text, len);
-#		   define RED RGB(255,0,0)
-      	           
-      	           SetBkMode(dc, OPAQUE);
-      	           SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));
-      	           
-      	           TextOut(dc, this_line.left, this_line.top,
-      	           	   plain, len);
-      	           TextOut(dc, this_line.left + len * char_width, this_line.top,
-      	           	   blanks, COLS - len);
-      	           SetBkMode(dc, TRANSPARENT);
-      	           SetTextColor(dc, RED);
-      	           TextOut(dc, this_line.left, this_line.top,
-      	           	   control, strlen(control));
-      	       }
-      	   }
-      	   EndPaint(hwnd, &ps);
-      	   screen_was_painted = 1;
-      	   return 0;
-   }
-   return DefWindowProc (hwnd, message, wParam, lParam);
-}
-
-int last_col;
-int last_line;
-
-void move_cursor(int c, int l)
-{
-    last_col = c;
-    last_line = l;
-    
-    if (caret_visible) update_cursor();
-}
-
-void update_cursor(void)
-{
-    SetCaretPos(last_col * char_width, last_line * char_height);
-    ShowCaret(hwnd);
-}
-
-void invalidate_line(int i)
-{
-    RECT line;
-    
-    if (!screen_was_painted) return;
-    	/* Invalidating a rectangle before painting seems result in a	*/
-    	/* major performance problem.					*/
-    get_line_rect(i, COLS*char_width, &line);
-    InvalidateRect(hwnd, &line, FALSE);
-}
-
-LRESULT CALLBACK AboutBox( HWND hDlg, UINT message,
-                           WPARAM wParam, LPARAM lParam )
-{
-   switch( message )
-   {
-      case WM_INITDIALOG:
-           SetFocus( GetDlgItem( hDlg, IDOK ) );
-           break;
-
-      case WM_COMMAND:
-           switch( wParam )
-           {
-              case IDOK:
-                   EndDialog( hDlg, TRUE );
-                   break;
-           }
-           break;
-
-      case WM_CLOSE:
-           EndDialog( hDlg, TRUE );
-           return TRUE;
-
-   }
-   return FALSE;
-}
-
diff --git a/boehm-gc/cord/de_win.h b/boehm-gc/cord/de_win.h
deleted file mode 100644
index 57a47b45c41..00000000000
--- a/boehm-gc/cord/de_win.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, May 19, 1994 2:25 pm PDT */
-
-/* cord.h, de_cmds.h, and windows.h should be included before this. */
-
-
-# define OTHER_FLAG	0x100
-# define EDIT_CMD_FLAG	0x200
-# define REPEAT_FLAG	0x400
-
-# define CHAR_CMD(i) ((i) & 0xff)
-
-/* MENU: DE */
-#define IDM_FILESAVE		(EDIT_CMD_FLAG + WRITE)
-#define IDM_FILEEXIT		(OTHER_FLAG + 1)
-#define IDM_HELPABOUT		(OTHER_FLAG + 2)
-#define IDM_HELPCONTENTS	(OTHER_FLAG + 3)
-
-#define IDM_EDITPDOWN		(REPEAT_FLAG + EDIT_CMD_FLAG + DOWN)
-#define IDM_EDITPUP		(REPEAT_FLAG + EDIT_CMD_FLAG + UP)
-#define IDM_EDITUNDO		(EDIT_CMD_FLAG + UNDO)
-#define IDM_EDITLOCATE		(EDIT_CMD_FLAG + LOCATE)
-#define IDM_EDITDOWN		(EDIT_CMD_FLAG + DOWN)
-#define IDM_EDITUP		(EDIT_CMD_FLAG + UP)
-#define IDM_EDITLEFT		(EDIT_CMD_FLAG + LEFT)
-#define IDM_EDITRIGHT		(EDIT_CMD_FLAG + RIGHT)
-#define IDM_EDITBS		(EDIT_CMD_FLAG + BS)
-#define IDM_EDITDEL		(EDIT_CMD_FLAG + DEL)
-#define IDM_EDITREPEAT		(EDIT_CMD_FLAG + REPEAT)
-#define IDM_EDITTOP		(EDIT_CMD_FLAG + TOP)
-
-
-
-
-/* Windows UI stuff	*/
-
-LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
-			  UINT wParam, LONG lParam);
-
-LRESULT CALLBACK AboutBox( HWND hDlg, UINT message,
-			   UINT wParam, LONG lParam );
-
-
-/* Screen dimensions.  Maintained by de_win.c.	*/
-extern int LINES;
-extern int COLS;
-
-/* File being edited.	*/
-extern char * arg_file_name;
-
-/* Current display position in file.  Maintained by de.c	*/
-extern int dis_line;
-extern int dis_col;
-
-/* Current cursor position in file.				*/
-extern int line;
-extern int col;
-
-/*
- *  Calls from de_win.c to de.c
- */
-  
-CORD retrieve_screen_line(int i);
-			/* Get the contents of i'th screen line.	*/
-			/* Relies on COLS.				*/
-
-void set_position(int x, int y);
-			/* Set column, row.  Upper left of window = (0,0). */
-
-void do_command(int);
-			/* Execute an editor command.			*/
-			/* Agument is a command character or one	*/
-			/* of the IDM_ commands.			*/
-
-void generic_init(void);
-			/* OS independent initialization */
-
-
-/*
- * Calls from de.c to de_win.c
- */
- 
-void move_cursor(int column, int line);
-			/* Physically move the cursor on the display,	*/
-			/* so that it appears at			*/
-			/* (column, line).				*/
-
-void invalidate_line(int line);
-			/* Invalidate line i on the screen.	*/
-
-void de_error(char *s);
-			/* Display error message.	*/
\ No newline at end of file
diff --git a/boehm-gc/darwin_stop_world.c b/boehm-gc/darwin_stop_world.c
deleted file mode 100644
index 719b1b02d35..00000000000
--- a/boehm-gc/darwin_stop_world.c
+++ /dev/null
@@ -1,510 +0,0 @@
-#include "private/pthread_support.h"
-
-/* This probably needs more porting work to ppc64. */
-
-# if defined(GC_DARWIN_THREADS)
-
-/* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
-   Page 49:
-   "The space beneath the stack pointer, where a new stack frame would normally
-   be allocated, is called the red zone. This area as shown in Figure 3-2 may
-   be used for any purpose as long as a new stack frame does not need to be
-   added to the stack."
-
-   Page 50: "If a leaf procedure's red zone usage would exceed 224 bytes, then
-   it must set up a stack frame just like routines that call other routines."
-*/
-#if defined(__ppc__)
-# define PPC_RED_ZONE_SIZE 224
-#elif defined(__ppc64__)
-# define PPC_RED_ZONE_SIZE 320
-#endif
-
-typedef struct StackFrame {
-  unsigned long	savedSP;
-  unsigned long	savedCR;
-  unsigned long	savedLR;
-  unsigned long	reserved[2];
-  unsigned long	savedRTOC;
-} StackFrame;
-
-unsigned long FindTopOfStack(unsigned long stack_start) {
-  StackFrame	*frame;
-  
-  if (stack_start == 0) {
-# ifdef POWERPC
-#   if CPP_WORDSZ == 32
-      __asm__ volatile("lwz	%0,0(r1)" : "=r" (frame));
-#   else
-      __asm__ volatile("ld	%0,0(r1)" : "=r" (frame));
-#   endif
-# endif
-  } else {
-    frame = (StackFrame *)stack_start;
-  }
-
-# ifdef DEBUG_THREADS
-    /* GC_printf1("FindTopOfStack start at sp = %p\n", frame); */
-# endif
-  do {
-    if (frame->savedSP == 0) break;
-    		/* if there are no more stack frames, stop */
-
-    frame = (StackFrame*)frame->savedSP;
-
-    /* we do these next two checks after going to the next frame
-       because the LR for the first stack frame in the loop
-       is not set up on purpose, so we shouldn't check it. */
-    if ((frame->savedLR & ~3) == 0) break; /* if the next LR is bogus, stop */
-    if ((~(frame->savedLR) & ~3) == 0) break; /* ditto */
-  } while (1); 
-
-# ifdef DEBUG_THREADS
-    /* GC_printf1("FindTopOfStack finish at sp = %p\n", frame); */
-# endif
-
-  return (unsigned long)frame;
-}	
-
-#ifdef DARWIN_DONT_PARSE_STACK
-void GC_push_all_stacks() {
-  int i;
-  kern_return_t r;
-  GC_thread p;
-  pthread_t me;
-  ptr_t lo, hi;
-  GC_THREAD_STATE_T state;
-  mach_msg_type_number_t thread_state_count = GC_MACH_THREAD_STATE_COUNT;
-  
-  me = pthread_self();
-  if (!GC_thr_initialized) GC_thr_init();
-  
-  for(i=0;i<THREAD_TABLE_SZ;i++) {
-    for(p=GC_threads[i];p!=0;p=p->next) {
-      if(p -> flags & FINISHED) continue;
-      if(pthread_equal(p->id,me)) {
-	lo = GC_approx_sp();
-      } else {
-	/* Get the thread state (registers, etc) */
-	r = thread_get_state(p->stop_info.mach_thread, GC_MACH_THREAD_STATE,
-			     (natural_t*)&state, &thread_state_count);
-	if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
-
-#if defined(I386)
-	lo = (void*)state . THREAD_FLD (esp);
-
-	GC_push_one(state . THREAD_FLD (eax)); 
-	GC_push_one(state . THREAD_FLD (ebx)); 
-	GC_push_one(state . THREAD_FLD (ecx)); 
-	GC_push_one(state . THREAD_FLD (edx)); 
-	GC_push_one(state . THREAD_FLD (edi)); 
-	GC_push_one(state . THREAD_FLD (esi)); 
-	GC_push_one(state . THREAD_FLD (ebp));
-
-#elif defined(X86_64)
-	lo = (void*)state . THREAD_FLD (rsp);
-
-	GC_push_one(state . THREAD_FLD (rax));
-	GC_push_one(state . THREAD_FLD (rbx));
-	GC_push_one(state . THREAD_FLD (rcx));
-	GC_push_one(state . THREAD_FLD (rdx));
-	GC_push_one(state . THREAD_FLD (rdi));
-	GC_push_one(state . THREAD_FLD (rsi));
-	GC_push_one(state . THREAD_FLD (rbp));
-	GC_push_one(state . THREAD_FLD (rsp));
-	GC_push_one(state . THREAD_FLD (r8));
-	GC_push_one(state . THREAD_FLD (r9));
-	GC_push_one(state . THREAD_FLD (r10));
-	GC_push_one(state . THREAD_FLD (r11));
-	GC_push_one(state . THREAD_FLD (r12));
-	GC_push_one(state . THREAD_FLD (r13));
-	GC_push_one(state . THREAD_FLD (r14));
-	GC_push_one(state . THREAD_FLD (r15));
-	GC_push_one(state . THREAD_FLD (rip));
-	GC_push_one(state . THREAD_FLD (rflags));
-	GC_push_one(state . THREAD_FLD (cs));
-	GC_push_one(state . THREAD_FLD (fs));
-	GC_push_one(state . THREAD_FLD (gs));
-
-#elif defined(POWERPC)
-	lo = (void*)(state . THREAD_FLD (r1) - PPC_RED_ZONE_SIZE);
-        
-	GC_push_one(state . THREAD_FLD (r0)); 
-	GC_push_one(state . THREAD_FLD (r2)); 
-	GC_push_one(state . THREAD_FLD (r3)); 
-	GC_push_one(state . THREAD_FLD (r4)); 
-	GC_push_one(state . THREAD_FLD (r5)); 
-	GC_push_one(state . THREAD_FLD (r6)); 
-	GC_push_one(state . THREAD_FLD (r7)); 
-	GC_push_one(state . THREAD_FLD (r8)); 
-	GC_push_one(state . THREAD_FLD (r9)); 
-	GC_push_one(state . THREAD_FLD (r10)); 
-	GC_push_one(state . THREAD_FLD (r11)); 
-	GC_push_one(state . THREAD_FLD (r12)); 
-	GC_push_one(state . THREAD_FLD (r13)); 
-	GC_push_one(state . THREAD_FLD (r14)); 
-	GC_push_one(state . THREAD_FLD (r15)); 
-	GC_push_one(state . THREAD_FLD (r16)); 
-	GC_push_one(state . THREAD_FLD (r17)); 
-	GC_push_one(state . THREAD_FLD (r18)); 
-	GC_push_one(state . THREAD_FLD (r19)); 
-	GC_push_one(state . THREAD_FLD (r20)); 
-	GC_push_one(state . THREAD_FLD (r21)); 
-	GC_push_one(state . THREAD_FLD (r22)); 
-	GC_push_one(state . THREAD_FLD (r23)); 
-	GC_push_one(state . THREAD_FLD (r24)); 
-	GC_push_one(state . THREAD_FLD (r25)); 
-	GC_push_one(state . THREAD_FLD (r26)); 
-	GC_push_one(state . THREAD_FLD (r27)); 
-	GC_push_one(state . THREAD_FLD (r28)); 
-	GC_push_one(state . THREAD_FLD (r29)); 
-	GC_push_one(state . THREAD_FLD (r30)); 
-	GC_push_one(state . THREAD_FLD (r31));
-#else
-# error FIXME for non-x86 || ppc architectures
-#endif
-      } /* p != me */
-      if(p->flags & MAIN_THREAD)
-	hi = GC_stackbottom;
-      else
-	hi = p->stack_end;
-#if DEBUG_THREADS
-      GC_printf3("Darwin: Stack for thread 0x%lx = [%lx,%lx)\n",
-		 (unsigned long) p -> id,
-		 (unsigned long) lo,
-		 (unsigned long) hi
-		 );
-#endif
-      GC_push_all_stack(lo,hi);
-    } /* for(p=GC_threads[i]...) */
-  } /* for(i=0;i<THREAD_TABLE_SZ...) */
-}
-
-#else /* !DARWIN_DONT_PARSE_STACK; Use FindTopOfStack() */
-
-void GC_push_all_stacks() {
-    int i;
-    kern_return_t r;
-    mach_port_t me;
-    ptr_t lo, hi;
-    thread_act_array_t act_list = 0;
-    mach_msg_type_number_t listcount = 0;
-
-    me = mach_thread_self();
-    if (!GC_thr_initialized) GC_thr_init();
-    
-    r = task_threads(current_task(), &act_list, &listcount);
-    if(r != KERN_SUCCESS) ABORT("task_threads failed");
-    for(i = 0; i < listcount; i++) {
-      thread_act_t thread = act_list[i];
-      if (thread == me) {
-	lo = GC_approx_sp();
-	hi = (ptr_t)FindTopOfStack(0);
-      } else {
-#     if defined(__ppc__) || defined(__ppc64__)
-	GC_THREAD_STATE_T info;
-	mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-	r = thread_get_state(thread, GC_MACH_THREAD_STATE,
-			     (natural_t *)&info, &outCount);
-	if(r != KERN_SUCCESS) ABORT("task_get_state failed");
-
-	lo = (void*)(info . THREAD_FLD (r1) - PPC_RED_ZONE_SIZE);
-	hi = (ptr_t)FindTopOfStack(info . THREAD_FLD (r1));
-
-	GC_push_one(info . THREAD_FLD (r0)); 
-	GC_push_one(info . THREAD_FLD (r2)); 
-	GC_push_one(info . THREAD_FLD (r3)); 
-	GC_push_one(info . THREAD_FLD (r4)); 
-	GC_push_one(info . THREAD_FLD (r5)); 
-	GC_push_one(info . THREAD_FLD (r6)); 
-	GC_push_one(info . THREAD_FLD (r7)); 
-	GC_push_one(info . THREAD_FLD (r8)); 
-	GC_push_one(info . THREAD_FLD (r9)); 
-	GC_push_one(info . THREAD_FLD (r10)); 
-	GC_push_one(info . THREAD_FLD (r11)); 
-	GC_push_one(info . THREAD_FLD (r12)); 
-	GC_push_one(info . THREAD_FLD (r13)); 
-	GC_push_one(info . THREAD_FLD (r14)); 
-	GC_push_one(info . THREAD_FLD (r15)); 
-	GC_push_one(info . THREAD_FLD (r16)); 
-	GC_push_one(info . THREAD_FLD (r17)); 
-	GC_push_one(info . THREAD_FLD (r18)); 
-	GC_push_one(info . THREAD_FLD (r19)); 
-	GC_push_one(info . THREAD_FLD (r20)); 
-	GC_push_one(info . THREAD_FLD (r21)); 
-	GC_push_one(info . THREAD_FLD (r22)); 
-	GC_push_one(info . THREAD_FLD (r23)); 
-	GC_push_one(info . THREAD_FLD (r24)); 
-	GC_push_one(info . THREAD_FLD (r25)); 
-	GC_push_one(info . THREAD_FLD (r26)); 
-	GC_push_one(info . THREAD_FLD (r27)); 
-	GC_push_one(info . THREAD_FLD (r28)); 
-	GC_push_one(info . THREAD_FLD (r29)); 
-	GC_push_one(info . THREAD_FLD (r30)); 
-	GC_push_one(info . THREAD_FLD (r31));
-#      else
-	/* FIXME: Remove after testing:	*/
-	WARN("This is completely untested and likely will not work\n", 0);
-	GC_THREAD_STATE_T info;
-	mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-	r = thread_get_state(thread, GC_MACH_THREAD_STATE, (natural_t *)&info,
-			     &outCount);
-	if(r != KERN_SUCCESS) ABORT("task_get_state failed");
-
-	lo = (void*)info . THREAD_FLD (esp);
-	hi = (ptr_t)FindTopOfStack(info . THREAD_FLD (esp));
-
-	GC_push_one(info . THREAD_FLD (eax)); 
-	GC_push_one(info . THREAD_FLD (ebx)); 
-	GC_push_one(info . THREAD_FLD (ecx)); 
-	GC_push_one(info . THREAD_FLD (edx)); 
-	GC_push_one(info . THREAD_FLD (edi)); 
-	GC_push_one(info . THREAD_FLD (esi)); 
-	/* GC_push_one(info . THREAD_FLD (ebp));  */
-	/* GC_push_one(info . THREAD_FLD (esp));  */
-	GC_push_one(info . THREAD_FLD (ss)); 
-	GC_push_one(info . THREAD_FLD (eip)); 
-	GC_push_one(info . THREAD_FLD (cs)); 
-	GC_push_one(info . THREAD_FLD (ds)); 
-	GC_push_one(info . THREAD_FLD (es)); 
-	GC_push_one(info . THREAD_FLD (fs)); 
-	GC_push_one(info . THREAD_FLD (gs)); 
-#      endif /* !POWERPC */
-      }
-#     if DEBUG_THREADS
-       GC_printf3("Darwin: Stack for thread 0x%lx = [%lx,%lx)\n",
-		  (unsigned long) thread,
-		  (unsigned long) lo,
-		  (unsigned long) hi
-		 );
-#     endif
-      GC_push_all_stack(lo, hi); 
-    } /* for(p=GC_threads[i]...) */
-    vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
-}
-#endif /* !DARWIN_DONT_PARSE_STACK */
-
-static mach_port_t GC_mach_handler_thread;
-static int GC_use_mach_handler_thread = 0;
-
-static struct GC_mach_thread GC_mach_threads[THREAD_TABLE_SZ];
-static int GC_mach_threads_count;
-
-void GC_stop_init() {
-  int i;
-
-  for (i = 0; i < THREAD_TABLE_SZ; i++) {
-    GC_mach_threads[i].thread = 0;
-    GC_mach_threads[i].already_suspended = 0;
-  }
-  GC_mach_threads_count = 0;
-}
-
-/* returns true if there's a thread in act_list that wasn't in old_list */
-int GC_suspend_thread_list(thread_act_array_t act_list, int count, 
-			   thread_act_array_t old_list, int old_count) {
-  mach_port_t my_thread = mach_thread_self();
-  int i, j;
-
-  int changed = 0;
-
-  for(i = 0; i < count; i++) {
-    thread_act_t thread = act_list[i];
-#   if DEBUG_THREADS 
-      GC_printf1("Attempting to suspend thread %p\n", thread);
-#   endif
-    /* find the current thread in the old list */
-    int found = 0;
-    for(j = 0; j < old_count; j++) {
-      thread_act_t old_thread = old_list[j];
-      if (old_thread == thread) {
-	found = 1;
-	break;
-      }
-    }
-    if (!found) {
-      /* add it to the GC_mach_threads list */
-      GC_mach_threads[GC_mach_threads_count].thread = thread;
-      /* default is not suspended */
-      GC_mach_threads[GC_mach_threads_count].already_suspended = 0;
-      changed = 1;
-    }      
-
-    if (thread != my_thread &&
-	(!GC_use_mach_handler_thread
-	 || (GC_use_mach_handler_thread
-	     && GC_mach_handler_thread != thread))) {
-      struct thread_basic_info info;
-      mach_msg_type_number_t outCount = THREAD_INFO_MAX;
-      kern_return_t kern_result = thread_info(thread, THREAD_BASIC_INFO,
-				(thread_info_t)&info, &outCount);
-      if(kern_result != KERN_SUCCESS) {
-	/* the thread may have quit since the thread_threads () call 
-	 * we mark already_suspended so it's not dealt with anymore later
-	 */
-        if (!found) {
-	  GC_mach_threads[GC_mach_threads_count].already_suspended = TRUE;
-    	  GC_mach_threads_count++;
-	}
-	continue;
-      }
-#     if DEBUG_THREADS
-        GC_printf2("Thread state for 0x%lx = %d\n", thread, info.run_state);
-#     endif
-      if (!found) {
-	GC_mach_threads[GC_mach_threads_count].already_suspended = info.suspend_count;
-      }
-      if (info.suspend_count) continue;
-      
-#     if DEBUG_THREADS
-        GC_printf1("Suspending 0x%lx\n", thread);
-#     endif
-      /* Suspend the thread */
-      kern_result = thread_suspend(thread);
-      if(kern_result != KERN_SUCCESS) {
-	/* the thread may have quit since the thread_threads () call 
-	 * we mark already_suspended so it's not dealt with anymore later
-	 */
-        if (!found) {
-	  GC_mach_threads[GC_mach_threads_count].already_suspended = TRUE;
-    	  GC_mach_threads_count++;
-	}
-	continue;
-      }
-    } 
-    if (!found) GC_mach_threads_count++;
-  }
-  return changed;
-}
-
-
-/* Caller holds allocation lock.	*/
-void GC_stop_world()
-{
-  int i, changes;
-    GC_thread p;
-    mach_port_t my_thread = mach_thread_self();
-    kern_return_t kern_result;
-    thread_act_array_t act_list, prev_list;
-    mach_msg_type_number_t listcount, prevcount;
-    
-#   if DEBUG_THREADS
-      GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self());
-#   endif
-
-    /* clear out the mach threads list table */
-    GC_stop_init(); 
-       
-    /* Make sure all free list construction has stopped before we start. */
-    /* No new construction can start, since free list construction is	*/
-    /* required to acquire and release the GC lock before it starts,	*/
-    /* and we have the lock.						*/
-#   ifdef PARALLEL_MARK
-      GC_acquire_mark_lock();
-      GC_ASSERT(GC_fl_builder_count == 0);
-      /* We should have previously waited for it to become zero. */
-#   endif /* PARALLEL_MARK */
-
-      /* Loop stopping threads until you have gone over the whole list
-	 twice without a new one appearing. thread_create() won't
-	 return (and thus the thread stop) until the new thread
-	 exists, so there is no window whereby you could stop a
-	 thread, recognise it is stopped, but then have a new thread
-	 it created before stopping show up later.
-      */
-      
-      changes = 1;
-      prev_list = NULL;
-      prevcount = 0;
-      do {
-	int result;
-	kern_result = task_threads(current_task(), &act_list, &listcount);
-	result = GC_suspend_thread_list(act_list, listcount,
-					prev_list, prevcount);
-	changes = result;
-	prev_list = act_list;
-	prevcount = listcount;
-        vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
-      } while (changes);
-      
- 
-#   ifdef MPROTECT_VDB
-      if(GC_incremental) {
-        extern void GC_mprotect_stop();
-        GC_mprotect_stop();
-      }
-#   endif
-    
-#   ifdef PARALLEL_MARK
-      GC_release_mark_lock();
-#   endif
-    #if DEBUG_THREADS
-      GC_printf1("World stopped from 0x%lx\n", my_thread);
-    #endif
-}
-
-/* Caller holds allocation lock, and has held it continuously since	*/
-/* the world stopped.							*/
-void GC_start_world()
-{
-  mach_port_t my_thread = mach_thread_self();
-  int i, j;
-  GC_thread p;
-  kern_return_t kern_result;
-  thread_act_array_t act_list;
-  mach_msg_type_number_t listcount;
-  struct thread_basic_info info;
-  mach_msg_type_number_t outCount = THREAD_INFO_MAX;
-  
-#   if DEBUG_THREADS
-      GC_printf0("World starting\n");
-#   endif
-
-#   ifdef MPROTECT_VDB
-      if(GC_incremental) {
-        extern void GC_mprotect_resume();
-        GC_mprotect_resume();
-      }
-#   endif
-
-    kern_result = task_threads(current_task(), &act_list, &listcount);
-    for(i = 0; i < listcount; i++) {
-      thread_act_t thread = act_list[i];
-      if (thread != my_thread &&
-	  (!GC_use_mach_handler_thread ||
-	   (GC_use_mach_handler_thread && GC_mach_handler_thread != thread))) {
-	for(j = 0; j < GC_mach_threads_count; j++) {
-	  if (thread == GC_mach_threads[j].thread) {
-	    if (GC_mach_threads[j].already_suspended) {
-#             if DEBUG_THREADS
-	        GC_printf1("Not resuming already suspended thread %p\n", thread);
-#             endif
-	      continue;
-	    }
-	    kern_result = thread_info(thread, THREAD_BASIC_INFO,
-				      (thread_info_t)&info, &outCount);
-	    if(kern_result != KERN_SUCCESS) ABORT("thread_info failed");
-#           if DEBUG_THREADS
-	      GC_printf2("Thread state for 0x%lx = %d\n", thread,
-			 info.run_state);
-	      GC_printf1("Resuming 0x%lx\n", thread);
-#           endif
-	    /* Resume the thread */
-	    kern_result = thread_resume(thread);
-	    if(kern_result != KERN_SUCCESS) ABORT("thread_resume failed");
-	  } 
-	}
-      }
-    }
-    vm_deallocate(current_task(), (vm_address_t)act_list, sizeof(thread_t) * listcount);
-#   if DEBUG_THREADS
-     GC_printf0("World started\n");
-#   endif
-}
-
-void GC_darwin_register_mach_handler_thread(mach_port_t thread) {
-  GC_mach_handler_thread = thread;
-  GC_use_mach_handler_thread = 1;
-}
-
-#endif
diff --git a/boehm-gc/dbg_mlc.c b/boehm-gc/dbg_mlc.c
deleted file mode 100644
index 061a6a537b7..00000000000
--- a/boehm-gc/dbg_mlc.c
+++ /dev/null
@@ -1,1220 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
- * Copyright (C) 2007 Free Software Foundation, Inc
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include "private/dbg_mlc.h"
-
-void GC_default_print_heap_obj_proc();
-GC_API void GC_register_finalizer_no_order
-    	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-
-
-#ifndef SHORT_DBG_HDRS
-/* Check whether object with base pointer p has debugging info	*/ 
-/* p is assumed to point to a legitimate object in our part	*/
-/* of the heap.							*/
-/* This excludes the check as to whether the back pointer is 	*/
-/* odd, which is added by the GC_HAS_DEBUG_INFO macro.		*/
-/* Note that if DBG_HDRS_ALL is set, uncollectable objects	*/
-/* on free lists may not have debug information set.  Thus it's	*/
-/* not always safe to return TRUE, even if the client does	*/
-/* its part.							*/
-GC_bool GC_has_other_debug_info(p)
-ptr_t p;
-{
-    register oh * ohdr = (oh *)p;
-    register ptr_t body = (ptr_t)(ohdr + 1);
-    register word sz = GC_size((ptr_t) ohdr);
-    
-    if (HBLKPTR((ptr_t)ohdr) != HBLKPTR((ptr_t)body)
-        || sz < DEBUG_BYTES + EXTRA_BYTES) {
-        return(FALSE);
-    }
-    if (ohdr -> oh_sz == sz) {
-    	/* Object may have had debug info, but has been deallocated	*/
-    	return(FALSE);
-    }
-    if (ohdr -> oh_sf == (START_FLAG ^ (word)body)) return(TRUE);
-    if (((word *)ohdr)[BYTES_TO_WORDS(sz)-1] == (END_FLAG ^ (word)body)) {
-        return(TRUE);
-    }
-    return(FALSE);
-}
-#endif
-
-#ifdef KEEP_BACK_PTRS
-
-# include <stdlib.h>
-
-# if defined(LINUX) || defined(SUNOS4) || defined(SUNOS5) \
-     || defined(HPUX) || defined(IRIX5) || defined(OSF1)
-#   define RANDOM() random()
-# else
-#   define RANDOM() (long)rand()
-# endif
-
-  /* Store back pointer to source in dest, if that appears to be possible. */
-  /* This is not completely safe, since we may mistakenly conclude that	   */
-  /* dest has a debugging wrapper.  But the error probability is very	   */
-  /* small, and this shouldn't be used in production code.		   */
-  /* We assume that dest is the real base pointer.  Source will usually    */
-  /* be a pointer to the interior of an object.				   */
-  void GC_store_back_pointer(ptr_t source, ptr_t dest)
-  {
-    if (GC_HAS_DEBUG_INFO(dest)) {
-      ((oh *)dest) -> oh_back_ptr = HIDE_BACK_PTR(source);
-    }
-  }
-
-  void GC_marked_for_finalization(ptr_t dest) {
-    GC_store_back_pointer(MARKED_FOR_FINALIZATION, dest);
-  }
-
-  /* Store information about the object referencing dest in *base_p	*/
-  /* and *offset_p.							*/
-  /*   source is root ==> *base_p = address, *offset_p = 0		*/
-  /*   source is heap object ==> *base_p != 0, *offset_p = offset 	*/
-  /*   Returns 1 on success, 0 if source couldn't be determined.	*/
-  /* Dest can be any address within a heap object.			*/
-  GC_ref_kind GC_get_back_ptr_info(void *dest, void **base_p, size_t *offset_p)
-  {
-    oh * hdr = (oh *)GC_base(dest);
-    ptr_t bp;
-    ptr_t bp_base;
-    if (!GC_HAS_DEBUG_INFO((ptr_t) hdr)) return GC_NO_SPACE;
-    bp = REVEAL_POINTER(hdr -> oh_back_ptr);
-    if (MARKED_FOR_FINALIZATION == bp) return GC_FINALIZER_REFD;
-    if (MARKED_FROM_REGISTER == bp) return GC_REFD_FROM_REG;
-    if (NOT_MARKED == bp) return GC_UNREFERENCED;
-#   if ALIGNMENT == 1
-      /* Heuristically try to fix off by 1 errors we introduced by 	*/
-      /* insisting on even addresses.					*/
-      {
-	ptr_t alternate_ptr = bp + 1;
-	ptr_t target = *(ptr_t *)bp;
-	ptr_t alternate_target = *(ptr_t *)alternate_ptr;
-
-	if (alternate_target >= GC_least_plausible_heap_addr
-	    && alternate_target <= GC_greatest_plausible_heap_addr
-	    && (target < GC_least_plausible_heap_addr
-		|| target > GC_greatest_plausible_heap_addr)) {
-	    bp = alternate_ptr;
-	}
-      }
-#   endif
-    bp_base = GC_base(bp);
-    if (0 == bp_base) {
-      *base_p = bp;
-      *offset_p = 0;
-      return GC_REFD_FROM_ROOT;
-    } else {
-      if (GC_HAS_DEBUG_INFO(bp_base)) bp_base += sizeof(oh);
-      *base_p = bp_base;
-      *offset_p = bp - bp_base;
-      return GC_REFD_FROM_HEAP;
-    }
-  }
-
-  /* Generate a random heap address.		*/
-  /* The resulting address is in the heap, but	*/
-  /* not necessarily inside a valid object.	*/
-  void *GC_generate_random_heap_address(void)
-  {
-    int i;
-    long heap_offset = RANDOM();
-    if (GC_heapsize > RAND_MAX) {
-	heap_offset *= RAND_MAX;
-	heap_offset += RANDOM();
-    }
-    heap_offset %= GC_heapsize;
-    	/* This doesn't yield a uniform distribution, especially if	*/
-        /* e.g. RAND_MAX = 1.5* GC_heapsize.  But for typical cases,	*/
-        /* it's not too bad.						*/
-    for (i = 0; i < GC_n_heap_sects; ++ i) {
-	int size = GC_heap_sects[i].hs_bytes;
-	if (heap_offset < size) {
-	    return GC_heap_sects[i].hs_start + heap_offset;
-	} else {
-	    heap_offset -= size;
-	}
-    }
-    ABORT("GC_generate_random_heap_address: size inconsistency");
-    /*NOTREACHED*/
-    return 0;
-  }
-
-  /* Generate a random address inside a valid marked heap object. */
-  void *GC_generate_random_valid_address(void)
-  {
-    ptr_t result;
-    ptr_t base;
-    for (;;) {
-	result = GC_generate_random_heap_address();
-  	base = GC_base(result);
-	if (0 == base) continue;
-	if (!GC_is_marked(base)) continue;
-	return result;
-    }
-  }
-
-  /* Print back trace for p */
-  void GC_print_backtrace(void *p)
-  {
-    void *current = p;
-    int i;
-    GC_ref_kind source;
-    size_t offset;
-    void *base;
-
-    GC_print_heap_obj(GC_base(current));
-    GC_err_printf0("\n");
-    for (i = 0; ; ++i) {
-      source = GC_get_back_ptr_info(current, &base, &offset);
-      if (GC_UNREFERENCED == source) {
-	GC_err_printf0("Reference could not be found\n");
-  	goto out;
-      }
-      if (GC_NO_SPACE == source) {
-	GC_err_printf0("No debug info in object: Can't find reference\n");
-	goto out;
-      }
-      GC_err_printf1("Reachable via %d levels of pointers from ",
-		 (unsigned long)i);
-      switch(source) {
-	case GC_REFD_FROM_ROOT:
-	  GC_err_printf1("root at 0x%lx\n\n", (unsigned long)base);
-	  goto out;
-	case GC_REFD_FROM_REG:
-	  GC_err_printf0("root in register\n\n");
-	  goto out;
-	case GC_FINALIZER_REFD:
-	  GC_err_printf0("list of finalizable objects\n\n");
-	  goto out;
-	case GC_REFD_FROM_HEAP:
-	  GC_err_printf1("offset %ld in object:\n", (unsigned long)offset);
-	  /* Take GC_base(base) to get real base, i.e. header. */
-	  GC_print_heap_obj(GC_base(base));
-	  GC_err_printf0("\n");
-	  break;
-      }
-      current = base;
-    }
-    out:;
-  }
-
-  /* Force a garbage collection and generate a backtrace from a	*/
-  /* random heap address.					*/
-  void GC_generate_random_backtrace_no_gc(void)
-  {
-    void * current;
-    current = GC_generate_random_valid_address();
-    GC_printf1("\n****Chose address 0x%lx in object\n", (unsigned long)current);
-    GC_print_backtrace(current);
-  }
-    
-  void GC_generate_random_backtrace(void)
-  {
-    GC_gcollect();
-    GC_generate_random_backtrace_no_gc();
-  }
-    
-#endif /* KEEP_BACK_PTRS */
-
-# define CROSSES_HBLK(p, sz) \
-	(((word)(p + sizeof(oh) + sz - 1) ^ (word)p) >= HBLKSIZE)
-/* Store debugging info into p.  Return displaced pointer. */
-/* Assumes we don't hold allocation lock.		   */
-ptr_t GC_store_debug_info(p, sz, string, integer)
-register ptr_t p;	/* base pointer */
-word sz; 	/* bytes */
-GC_CONST char * string;
-word integer;
-{
-    register word * result = (word *)((oh *)p + 1);
-    DCL_LOCK_STATE;
-    
-    /* There is some argument that we should dissble signals here.	*/
-    /* But that's expensive.  And this way things should only appear	*/
-    /* inconsistent while we're in the handler.				*/
-    LOCK();
-    GC_ASSERT(GC_size(p) >= sizeof(oh) + sz);
-    GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK(p, sz)));
-#   ifdef KEEP_BACK_PTRS
-      ((oh *)p) -> oh_back_ptr = HIDE_BACK_PTR(NOT_MARKED);
-#   endif
-#   ifdef MAKE_BACK_GRAPH
-      ((oh *)p) -> oh_bg_ptr = HIDE_BACK_PTR((ptr_t)0);
-#   endif
-    ((oh *)p) -> oh_string = string;
-    ((oh *)p) -> oh_int = integer;
-#   ifndef SHORT_DBG_HDRS
-      ((oh *)p) -> oh_sz = sz;
-      ((oh *)p) -> oh_sf = START_FLAG ^ (word)result;
-      ((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =
-         result[SIMPLE_ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;
-#   endif
-    UNLOCK();
-    return((ptr_t)result);
-}
-
-#ifdef DBG_HDRS_ALL
-/* Store debugging info into p.  Return displaced pointer.	   */
-/* This version assumes we do hold the allocation lock.		   */
-ptr_t GC_store_debug_info_inner(p, sz, string, integer)
-register ptr_t p;	/* base pointer */
-word sz; 	/* bytes */
-char * string;
-word integer;
-{
-    register word * result = (word *)((oh *)p + 1);
-    
-    /* There is some argument that we should disable signals here.	*/
-    /* But that's expensive.  And this way things should only appear	*/
-    /* inconsistent while we're in the handler.				*/
-    GC_ASSERT(GC_size(p) >= sizeof(oh) + sz);
-    GC_ASSERT(!(SMALL_OBJ(sz) && CROSSES_HBLK(p, sz)));
-#   ifdef KEEP_BACK_PTRS
-      ((oh *)p) -> oh_back_ptr = HIDE_BACK_PTR(NOT_MARKED);
-#   endif
-#   ifdef MAKE_BACK_GRAPH
-      ((oh *)p) -> oh_bg_ptr = HIDE_BACK_PTR((ptr_t)0);
-#   endif
-    ((oh *)p) -> oh_string = string;
-    ((oh *)p) -> oh_int = integer;
-#   ifndef SHORT_DBG_HDRS
-      ((oh *)p) -> oh_sz = sz;
-      ((oh *)p) -> oh_sf = START_FLAG ^ (word)result;
-      ((word *)p)[BYTES_TO_WORDS(GC_size(p))-1] =
-         result[SIMPLE_ROUNDED_UP_WORDS(sz)] = END_FLAG ^ (word)result;
-#   endif
-    return((ptr_t)result);
-}
-#endif
-
-#ifndef SHORT_DBG_HDRS
-/* Check the object with debugging info at ohdr		*/
-/* return NIL if it's OK.  Else return clobbered	*/
-/* address.						*/
-ptr_t GC_check_annotated_obj(ohdr)
-register oh * ohdr;
-{
-    register ptr_t body = (ptr_t)(ohdr + 1);
-    register word gc_sz = GC_size((ptr_t)ohdr);
-    if (ohdr -> oh_sz + DEBUG_BYTES > gc_sz) {
-        return((ptr_t)(&(ohdr -> oh_sz)));
-    }
-    if (ohdr -> oh_sf != (START_FLAG ^ (word)body)) {
-        return((ptr_t)(&(ohdr -> oh_sf)));
-    }
-    if (((word *)ohdr)[BYTES_TO_WORDS(gc_sz)-1] != (END_FLAG ^ (word)body)) {
-        return((ptr_t)((word *)ohdr + BYTES_TO_WORDS(gc_sz)-1));
-    }
-    if (((word *)body)[SIMPLE_ROUNDED_UP_WORDS(ohdr -> oh_sz)]
-        != (END_FLAG ^ (word)body)) {
-        return((ptr_t)((word *)body + SIMPLE_ROUNDED_UP_WORDS(ohdr -> oh_sz)));
-    }
-    return(0);
-}
-#endif /* !SHORT_DBG_HDRS */
-
-static GC_describe_type_fn GC_describe_type_fns[MAXOBJKINDS] = {0};
-
-void GC_register_describe_type_fn(kind, fn)
-int kind;
-GC_describe_type_fn fn;
-{
-  GC_describe_type_fns[kind] = fn;
-}
-
-/* Print a type description for the object whose client-visible address	*/
-/* is p.								*/
-void GC_print_type(p)
-ptr_t p;
-{
-    hdr * hhdr = GC_find_header(p);
-    char buffer[GC_TYPE_DESCR_LEN + 1];
-    int kind = hhdr -> hb_obj_kind;
-
-    if (0 != GC_describe_type_fns[kind] && GC_is_marked(GC_base(p))) {
-	/* This should preclude free list objects except with	*/
-	/* thread-local allocation.				*/
-	buffer[GC_TYPE_DESCR_LEN] = 0;
-	(GC_describe_type_fns[kind])(p, buffer);
-	GC_ASSERT(buffer[GC_TYPE_DESCR_LEN] == 0);
-	GC_err_puts(buffer);
-    } else {
-	switch(kind) {
-	  case PTRFREE:
-	    GC_err_puts("PTRFREE");
-	    break;
-	  case NORMAL:
-	    GC_err_puts("NORMAL");
-	    break;
-	  case UNCOLLECTABLE:
-	    GC_err_puts("UNCOLLECTABLE");
-	    break;
-#	  ifdef ATOMIC_UNCOLLECTABLE
-	    case AUNCOLLECTABLE:
-	      GC_err_puts("ATOMIC UNCOLLECTABLE");
-	      break;
-#	  endif
-	  case STUBBORN:
-	    GC_err_puts("STUBBORN");
-	    break;
-	  default:
-	    GC_err_printf2("kind %ld, descr 0x%lx", kind, hhdr -> hb_descr);
-	}
-    }
-}
-
-    
-
-void GC_print_obj(p)
-ptr_t p;
-{
-    register oh * ohdr = (oh *)GC_base(p);
-    
-    GC_ASSERT(!I_HOLD_LOCK());
-    GC_err_printf1("0x%lx (", ((unsigned long)ohdr + sizeof(oh)));
-    GC_err_puts(ohdr -> oh_string);
-#   ifdef SHORT_DBG_HDRS
-      GC_err_printf1(":%ld, ", (unsigned long)(ohdr -> oh_int));
-#   else
-      GC_err_printf2(":%ld, sz=%ld, ", (unsigned long)(ohdr -> oh_int),
-          			        (unsigned long)(ohdr -> oh_sz));
-#   endif
-    GC_print_type((ptr_t)(ohdr + 1));
-    GC_err_puts(")\n");
-    PRINT_CALL_CHAIN(ohdr);
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_debug_print_heap_obj_proc(ptr_t p)
-# else
-    void GC_debug_print_heap_obj_proc(p)
-    ptr_t p;
-# endif
-{
-    GC_ASSERT(!I_HOLD_LOCK());
-    if (GC_HAS_DEBUG_INFO(p)) {
-	GC_print_obj(p);
-    } else {
-	GC_default_print_heap_obj_proc(p);
-    }
-}
-
-#ifndef SHORT_DBG_HDRS
-void GC_print_smashed_obj(p, clobbered_addr)
-ptr_t p, clobbered_addr;
-{
-    register oh * ohdr = (oh *)GC_base(p);
-    
-    GC_ASSERT(!I_HOLD_LOCK());
-    GC_err_printf2("0x%lx in object at 0x%lx(", (unsigned long)clobbered_addr,
-    					        (unsigned long)p);
-    if (clobbered_addr <= (ptr_t)(&(ohdr -> oh_sz))
-        || ohdr -> oh_string == 0) {
-        GC_err_printf1("<smashed>, appr. sz = %ld)\n",
-        	       (GC_size((ptr_t)ohdr) - DEBUG_BYTES));
-    } else {
-        if (ohdr -> oh_string[0] == '\0') {
-            GC_err_puts("EMPTY(smashed?)");
-        } else {
-            GC_err_puts(ohdr -> oh_string);
-        }
-        GC_err_printf2(":%ld, sz=%ld)\n", (unsigned long)(ohdr -> oh_int),
-        			          (unsigned long)(ohdr -> oh_sz));
-        PRINT_CALL_CHAIN(ohdr);
-    }
-}
-#endif
-
-void GC_check_heap_proc GC_PROTO((void));
-
-void GC_print_all_smashed_proc GC_PROTO((void));
-
-void GC_do_nothing() {}
-
-void GC_start_debugging()
-{
-#   ifndef SHORT_DBG_HDRS
-      GC_check_heap = GC_check_heap_proc;
-      GC_print_all_smashed = GC_print_all_smashed_proc;
-#   else
-      GC_check_heap = GC_do_nothing;
-      GC_print_all_smashed = GC_do_nothing;
-#   endif
-    GC_print_heap_obj = GC_debug_print_heap_obj_proc;
-    GC_debugging_started = TRUE;
-    GC_register_displacement((word)sizeof(oh));
-}
-
-size_t GC_debug_header_size = sizeof(oh);
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_debug_register_displacement(GC_word offset)
-# else
-    void GC_debug_register_displacement(offset) 
-    GC_word offset;
-# endif
-{
-    GC_register_displacement(offset);
-    GC_register_displacement((word)sizeof(oh) + offset);
-}
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-#   ifdef GC_ADD_CALLER
-	--> GC_ADD_CALLER not implemented for K&R C
-#   endif
-# endif
-{
-    GC_PTR result = GC_malloc(lb + DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc(%ld) returning NIL (",
-        	       (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_ignore_off_page(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-#   ifdef GC_ADD_CALLER
-	--> GC_ADD_CALLER not implemented for K&R C
-#   endif
-# endif
-{
-    GC_PTR result = GC_malloc_ignore_off_page(lb + DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc_ignore_off_page(%ld) returning NIL (",
-        	       (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_atomic_ignore_off_page(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_atomic_ignore_off_page(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-#   ifdef GC_ADD_CALLER
-	--> GC_ADD_CALLER not implemented for K&R C
-#   endif
-# endif
-{
-    GC_PTR result = GC_malloc_atomic_ignore_off_page(lb + DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc_atomic_ignore_off_page(%ld)"
-		       " returning NIL (", (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-# ifdef DBG_HDRS_ALL
-/* 
- * An allocation function for internal use.
- * Normally internally allocated objects do not have debug information.
- * But in this case, we need to make sure that all objects have debug
- * headers.
- * We assume debugging was started in collector initialization,
- * and we already hold the GC lock.
- */
-  GC_PTR GC_debug_generic_malloc_inner(size_t lb, int k)
-  {
-    GC_PTR result = GC_generic_malloc_inner(lb + DEBUG_BYTES, k);
-    
-    if (result == 0) {
-        GC_err_printf1("GC internal allocation (%ld bytes) returning NIL\n",
-        	       (unsigned long) lb);
-        return(0);
-    }
-    ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
-    return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", (word)0));
-  }
-
-  GC_PTR GC_debug_generic_malloc_inner_ignore_off_page(size_t lb, int k)
-  {
-    GC_PTR result = GC_generic_malloc_inner_ignore_off_page(
-					        lb + DEBUG_BYTES, k);
-    
-    if (result == 0) {
-        GC_err_printf1("GC internal allocation (%ld bytes) returning NIL\n",
-        	       (unsigned long) lb);
-        return(0);
-    }
-    ADD_CALL_CHAIN(result, GC_RETURN_ADDR);
-    return (GC_store_debug_info_inner(result, (word)lb, "INTERNAL", (word)0));
-  }
-# endif
-
-#ifdef STUBBORN_ALLOC
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_stubborn(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-# endif
-{
-    GC_PTR result = GC_malloc_stubborn(lb + DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc(%ld) returning NIL (",
-        	       (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-void GC_debug_change_stubborn(p)
-GC_PTR p;
-{
-    register GC_PTR q = GC_base(p);
-    register hdr * hhdr;
-    
-    if (q == 0) {
-        GC_err_printf1("Bad argument: 0x%lx to GC_debug_change_stubborn\n",
-        	       (unsigned long) p);
-        ABORT("GC_debug_change_stubborn: bad arg");
-    }
-    hhdr = HDR(q);
-    if (hhdr -> hb_obj_kind != STUBBORN) {
-        GC_err_printf1("GC_debug_change_stubborn arg not stubborn: 0x%lx\n",
-        	       (unsigned long) p);
-        ABORT("GC_debug_change_stubborn: arg not stubborn");
-    }
-    GC_change_stubborn(q);
-}
-
-void GC_debug_end_stubborn_change(p)
-GC_PTR p;
-{
-    register GC_PTR q = GC_base(p);
-    register hdr * hhdr;
-    
-    if (q == 0) {
-        GC_err_printf1("Bad argument: 0x%lx to GC_debug_end_stubborn_change\n",
-        	       (unsigned long) p);
-        ABORT("GC_debug_end_stubborn_change: bad arg");
-    }
-    hhdr = HDR(q);
-    if (hhdr -> hb_obj_kind != STUBBORN) {
-        GC_err_printf1("debug_end_stubborn_change arg not stubborn: 0x%lx\n",
-        	       (unsigned long) p);
-        ABORT("GC_debug_end_stubborn_change: arg not stubborn");
-    }
-    GC_end_stubborn_change(q);
-}
-
-#else /* !STUBBORN_ALLOC */
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_stubborn(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_stubborn(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-# endif
-{
-    return GC_debug_malloc(lb, OPT_RA s, i);
-}
-
-void GC_debug_change_stubborn(p)
-GC_PTR p;
-{
-}
-
-void GC_debug_end_stubborn_change(p)
-GC_PTR p;
-{
-}
-
-#endif /* !STUBBORN_ALLOC */
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_atomic(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_atomic(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-# endif
-{
-    GC_PTR result = GC_malloc_atomic(lb + DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc_atomic(%ld) returning NIL (",
-        	      (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-        GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_uncollectable(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_uncollectable(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-# endif
-{
-    GC_PTR result = GC_malloc_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1("GC_debug_malloc_uncollectable(%ld) returning NIL (",
-        	      (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-        GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-#ifdef ATOMIC_UNCOLLECTABLE
-# ifdef __STDC__
-    GC_PTR GC_debug_malloc_atomic_uncollectable(size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_malloc_atomic_uncollectable(lb, s, i)
-    size_t lb;
-    char * s;
-    int i;
-# endif
-{
-    GC_PTR result =
-	GC_malloc_atomic_uncollectable(lb + UNCOLLECTABLE_DEBUG_BYTES);
-    
-    if (result == 0) {
-        GC_err_printf1(
-		"GC_debug_malloc_atomic_uncollectable(%ld) returning NIL (",
-                (unsigned long) lb);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(0);
-    }
-    if (!GC_debugging_started) {
-        GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-#endif /* ATOMIC_UNCOLLECTABLE */
-
-# ifdef __STDC__
-    void GC_debug_free(GC_PTR p)
-# else
-    void GC_debug_free(p)
-    GC_PTR p;
-# endif
-{
-    register GC_PTR base;
-    register ptr_t clobbered;
-    
-    if (0 == p) return;
-    base = GC_base(p);
-    if (base == 0) {
-        GC_err_printf1("Attempt to free invalid pointer %lx\n",
-        	       (unsigned long)p);
-        ABORT("free(invalid pointer)");
-    }
-    if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
-        GC_err_printf1(
-        	  "GC_debug_free called on pointer %lx wo debugging info\n",
-        	  (unsigned long)p);
-    } else {
-#     ifndef SHORT_DBG_HDRS
-        clobbered = GC_check_annotated_obj((oh *)base);
-        if (clobbered != 0) {
-          if (((oh *)base) -> oh_sz == GC_size(base)) {
-            GC_err_printf0(
-                  "GC_debug_free: found previously deallocated (?) object at ");
-          } else {
-            GC_err_printf0("GC_debug_free: found smashed location at ");
-          }
-          GC_print_smashed_obj(p, clobbered);
-        }
-        /* Invalidate size */
-        ((oh *)base) -> oh_sz = GC_size(base);
-#     endif /* SHORT_DBG_HDRS */
-    }
-    if (GC_find_leak) {
-        GC_free(base);
-    } else {
-	register hdr * hhdr = HDR(p);
-	GC_bool uncollectable = FALSE;
-
-        if (hhdr ->  hb_obj_kind == UNCOLLECTABLE) {
-	    uncollectable = TRUE;
-	}
-#	ifdef ATOMIC_UNCOLLECTABLE
-	    if (hhdr ->  hb_obj_kind == AUNCOLLECTABLE) {
-		    uncollectable = TRUE;
-	    }
-#	endif
-	if (uncollectable) {
-	    GC_free(base);
-	} else {
-	    size_t i;
-	    size_t obj_sz = hhdr -> hb_sz - BYTES_TO_WORDS(sizeof(oh));
-
-	    for (i = 0; i < obj_sz; ++i) ((word *)p)[i] = 0xdeadbeef;
-	    GC_ASSERT((word *)p + i == (word *)base + hhdr -> hb_sz);
-	}
-    } /* !GC_find_leak */
-}
-
-#ifdef THREADS
-
-extern void GC_free_inner(GC_PTR p);
-
-/* Used internally; we assume it's called correctly.	*/
-void GC_debug_free_inner(GC_PTR p)
-{
-    GC_free_inner(GC_base(p));
-}
-#endif
-
-# ifdef __STDC__
-    GC_PTR GC_debug_realloc(GC_PTR p, size_t lb, GC_EXTRA_PARAMS)
-# else
-    GC_PTR GC_debug_realloc(p, lb, s, i)
-    GC_PTR p;
-    size_t lb;
-    char *s;
-    int i;
-# endif
-{
-    register GC_PTR base = GC_base(p);
-    register ptr_t clobbered;
-    register GC_PTR result;
-    register size_t copy_sz = lb;
-    register size_t old_sz;
-    register hdr * hhdr;
-    
-    if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
-    if (base == 0) {
-        GC_err_printf1(
-              "Attempt to reallocate invalid pointer %lx\n", (unsigned long)p);
-        ABORT("realloc(invalid pointer)");
-    }
-    if ((ptr_t)p - (ptr_t)base != sizeof(oh)) {
-        GC_err_printf1(
-        	"GC_debug_realloc called on pointer %lx wo debugging info\n",
-        	(unsigned long)p);
-        return(GC_realloc(p, lb));
-    }
-    hhdr = HDR(base);
-    switch (hhdr -> hb_obj_kind) {
-#    ifdef STUBBORN_ALLOC
-      case STUBBORN:
-        result = GC_debug_malloc_stubborn(lb, OPT_RA s, i);
-        break;
-#    endif
-      case NORMAL:
-        result = GC_debug_malloc(lb, OPT_RA s, i);
-        break;
-      case PTRFREE:
-        result = GC_debug_malloc_atomic(lb, OPT_RA s, i);
-        break;
-      case UNCOLLECTABLE:
-	result = GC_debug_malloc_uncollectable(lb, OPT_RA s, i);
- 	break;
-#    ifdef ATOMIC_UNCOLLECTABLE
-      case AUNCOLLECTABLE:
-	result = GC_debug_malloc_atomic_uncollectable(lb, OPT_RA s, i);
-	break;
-#    endif
-      default:
-        GC_err_printf0("GC_debug_realloc: encountered bad kind\n");
-        ABORT("bad kind");
-    }
-#   ifdef SHORT_DBG_HDRS
-      old_sz = GC_size(base) - sizeof(oh);
-#   else
-      clobbered = GC_check_annotated_obj((oh *)base);
-      if (clobbered != 0) {
-        GC_err_printf0("GC_debug_realloc: found smashed location at ");
-        GC_print_smashed_obj(p, clobbered);
-      }
-      old_sz = ((oh *)base) -> oh_sz;
-#   endif
-    if (old_sz < copy_sz) copy_sz = old_sz;
-    if (result == 0) return(0);
-    BCOPY(p, result,  copy_sz);
-    GC_debug_free(p);
-    return(result);
-}
-
-#ifndef SHORT_DBG_HDRS
-
-/* List of smashed objects.  We defer printing these, since we can't	*/
-/* always print them nicely with the allocation lock held.		*/
-/* We put them here instead of in GC_arrays, since it may be useful to	*/
-/* be able to look at them with the debugger.				*/
-#define MAX_SMASHED 20
-ptr_t GC_smashed[MAX_SMASHED];
-unsigned GC_n_smashed = 0;
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_add_smashed(ptr_t smashed)
-# else
-    void GC_add_smashed(smashed)
-    ptr_t smashed;
-#endif
-{
-    GC_ASSERT(GC_is_marked(GC_base(smashed)));
-    GC_smashed[GC_n_smashed] = smashed;
-    if (GC_n_smashed < MAX_SMASHED - 1) ++GC_n_smashed;
-      /* In case of overflow, we keep the first MAX_SMASHED-1	*/
-      /* entries plus the last one.				*/
-    GC_have_errors = TRUE;
-}
-
-/* Print all objects on the list.  Clear the list.	*/
-void GC_print_all_smashed_proc ()
-{
-    unsigned i;
-
-    GC_ASSERT(!I_HOLD_LOCK());
-    if (GC_n_smashed == 0) return;
-    GC_err_printf0("GC_check_heap_block: found smashed heap objects:\n");
-    for (i = 0; i < GC_n_smashed; ++i) {
-        GC_print_smashed_obj(GC_base(GC_smashed[i]), GC_smashed[i]);
-	GC_smashed[i] = 0;
-    }
-    GC_n_smashed = 0;
-}
-
-/* Check all marked objects in the given block for validity */
-/*ARGSUSED*/
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_check_heap_block(register struct hblk *hbp, word dummy)
-# else
-    void GC_check_heap_block(hbp, dummy)
-    register struct hblk *hbp;	/* ptr to current heap block		*/
-    word dummy;
-# endif
-{
-    register struct hblkhdr * hhdr = HDR(hbp);
-    register word sz = hhdr -> hb_sz;
-    register int word_no;
-    register word *p, *plim;
-    
-    p = (word *)(hbp->hb_body);
-    word_no = 0;
-    if (sz > MAXOBJSZ) {
-	plim = p;
-    } else {
-    	plim = (word *)((((word)hbp) + HBLKSIZE) - WORDS_TO_BYTES(sz));
-    }
-    /* go through all words in block */
-	while( p <= plim ) {
-	    if( mark_bit_from_hdr(hhdr, word_no)
-	        && GC_HAS_DEBUG_INFO((ptr_t)p)) {
-	        ptr_t clobbered = GC_check_annotated_obj((oh *)p);
-	        
-	        if (clobbered != 0) GC_add_smashed(clobbered);
-	    }
-	    word_no += sz;
-	    p += sz;
-	}
-}
-
-
-/* This assumes that all accessible objects are marked, and that	*/
-/* I hold the allocation lock.	Normally called by collector.		*/
-void GC_check_heap_proc()
-{
-#   ifndef SMALL_CONFIG
-#     ifdef ALIGN_DOUBLE
-        GC_STATIC_ASSERT((sizeof(oh) & (2 * sizeof(word) - 1)) == 0);
-#     else
-        GC_STATIC_ASSERT((sizeof(oh) & (sizeof(word) - 1)) == 0);
-#     endif
-#   endif
-    GC_apply_to_all_blocks(GC_check_heap_block, (word)0);
-}
-
-#endif /* !SHORT_DBG_HDRS */
-
-struct closure {
-    GC_finalization_proc cl_fn;
-    GC_PTR cl_data;
-};
-
-# ifdef __STDC__
-    void * GC_make_closure(GC_finalization_proc fn, void * data)
-# else
-    GC_PTR GC_make_closure(fn, data)
-    GC_finalization_proc fn;
-    GC_PTR data;
-# endif
-{
-    struct closure * result =
-#   ifdef DBG_HDRS_ALL
-      (struct closure *) GC_debug_malloc(sizeof (struct closure),
-				         GC_EXTRAS);
-#   else
-      (struct closure *) GC_malloc(sizeof (struct closure));
-#   endif
-    
-    result -> cl_fn = fn;
-    result -> cl_data = data;
-    return((GC_PTR)result);
-}
-
-# ifdef __STDC__
-    void GC_debug_invoke_finalizer(void * obj, void * data)
-# else
-    void GC_debug_invoke_finalizer(obj, data)
-    char * obj;
-    char * data;
-# endif
-{
-    register struct closure * cl = (struct closure *) data;
-    
-    (*(cl -> cl_fn))((GC_PTR)((char *)obj + sizeof(oh)), cl -> cl_data);
-} 
-
-/* Set ofn and ocd to reflect the values we got back.	*/
-static void store_old (obj, my_old_fn, my_old_cd, ofn, ocd)
-GC_PTR obj;
-GC_finalization_proc my_old_fn;
-struct closure * my_old_cd;
-GC_finalization_proc *ofn;
-GC_PTR *ocd;
-{
-    if (0 != my_old_fn) {
-      if (my_old_fn != GC_debug_invoke_finalizer) {
-        GC_err_printf1("Debuggable object at 0x%lx had non-debug finalizer.\n",
-		       obj);
-        /* This should probably be fatal. */
-      } else {
-        if (ofn) *ofn = my_old_cd -> cl_fn;
-        if (ocd) *ocd = my_old_cd -> cl_data;
-      }
-    } else {
-      if (ofn) *ofn = 0;
-      if (ocd) *ocd = 0;
-    }
-}
-
-# ifdef __STDC__
-    void GC_debug_register_finalizer(GC_PTR obj, GC_finalization_proc fn,
-    				     GC_PTR cd, GC_finalization_proc *ofn,
-				     GC_PTR *ocd)
-# else
-    void GC_debug_register_finalizer(obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc *ofn;
-    GC_PTR *ocd;
-# endif
-{
-    GC_finalization_proc my_old_fn;
-    GC_PTR my_old_cd;
-    ptr_t base = GC_base(obj);
-    if (0 == base) return;
-    if ((ptr_t)obj - base != sizeof(oh)) {
-        GC_err_printf1(
-	    "GC_debug_register_finalizer called with non-base-pointer 0x%lx\n",
-	    obj);
-    }
-    if (0 == fn) {
-      GC_register_finalizer(base, 0, 0, &my_old_fn, &my_old_cd);
-    } else {
-      GC_register_finalizer(base, GC_debug_invoke_finalizer,
-    			    GC_make_closure(fn,cd), &my_old_fn, &my_old_cd);
-    }
-    store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
-}
-
-# ifdef __STDC__
-    void GC_debug_register_finalizer_no_order
-    				    (GC_PTR obj, GC_finalization_proc fn,
-    				     GC_PTR cd, GC_finalization_proc *ofn,
-				     GC_PTR *ocd)
-# else
-    void GC_debug_register_finalizer_no_order
-    				    (obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc *ofn;
-    GC_PTR *ocd;
-# endif
-{
-    GC_finalization_proc my_old_fn;
-    GC_PTR my_old_cd;
-    ptr_t base = GC_base(obj);
-    if (0 == base) return;
-    if ((ptr_t)obj - base != sizeof(oh)) {
-        GC_err_printf1(
-	    "GC_debug_register_finalizer_no_order called with non-base-pointer 0x%lx\n",
-	    obj);
-    }
-    if (0 == fn) {
-      GC_register_finalizer_no_order(base, 0, 0, &my_old_fn, &my_old_cd);
-    } else {
-      GC_register_finalizer_no_order(base, GC_debug_invoke_finalizer,
-    			    	     GC_make_closure(fn,cd), &my_old_fn,
-				     &my_old_cd);
-    }
-    store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
-}
-
-# ifdef __STDC__
-    void GC_debug_register_finalizer_unreachable
-    				    (GC_PTR obj, GC_finalization_proc fn,
-    				     GC_PTR cd, GC_finalization_proc *ofn,
-				     GC_PTR *ocd)
-# else
-    void GC_debug_register_finalizer_unreachable
-    				    (obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc *ofn;
-    GC_PTR *ocd;
-# endif
-{
-    GC_finalization_proc my_old_fn;
-    GC_PTR my_old_cd;
-    ptr_t base = GC_base(obj);
-    if (0 == base) return;
-    if ((ptr_t)obj - base != sizeof(oh)) {
-        GC_err_printf1(
-	    "GC_debug_register_finalizer_unreachable called with non-base-pointer 0x%lx\n",
-	    obj);
-    }
-    if (0 == fn) {
-      GC_register_finalizer_unreachable(base, 0, 0, &my_old_fn, &my_old_cd);
-    } else {
-      GC_register_finalizer_unreachable(base, GC_debug_invoke_finalizer,
-    			    	     GC_make_closure(fn,cd), &my_old_fn,
-				     &my_old_cd);
-    }
-    store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
-}
-
-# ifdef __STDC__
-    void GC_debug_register_finalizer_ignore_self
-    				    (GC_PTR obj, GC_finalization_proc fn,
-    				     GC_PTR cd, GC_finalization_proc *ofn,
-				     GC_PTR *ocd)
-# else
-    void GC_debug_register_finalizer_ignore_self
-    				    (obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc *ofn;
-    GC_PTR *ocd;
-# endif
-{
-    GC_finalization_proc my_old_fn;
-    GC_PTR my_old_cd;
-    ptr_t base = GC_base(obj);
-    if (0 == base) return;
-    if ((ptr_t)obj - base != sizeof(oh)) {
-        GC_err_printf1(
-	    "GC_debug_register_finalizer_ignore_self called with non-base-pointer 0x%lx\n",
-	    obj);
-    }
-    if (0 == fn) {
-      GC_register_finalizer_ignore_self(base, 0, 0, &my_old_fn, &my_old_cd);
-    } else {
-      GC_register_finalizer_ignore_self(base, GC_debug_invoke_finalizer,
-    			    	     GC_make_closure(fn,cd), &my_old_fn,
-				     &my_old_cd);
-    }
-    store_old(obj, my_old_fn, (struct closure *)my_old_cd, ofn, ocd);
-}
-
-#ifdef GC_ADD_CALLER
-# define RA GC_RETURN_ADDR,
-#else
-# define RA
-#endif
-
-GC_PTR GC_debug_malloc_replacement(lb)
-size_t lb;
-{
-    return GC_debug_malloc(lb, RA "unknown", 0);
-}
-
-GC_PTR GC_debug_realloc_replacement(p, lb)
-GC_PTR p;
-size_t lb;
-{
-    return GC_debug_realloc(p, lb, RA "unknown", 0);
-}
diff --git a/boehm-gc/depcomp b/boehm-gc/depcomp
deleted file mode 100755
index 3480ce4e96d..00000000000
--- a/boehm-gc/depcomp
+++ /dev/null
@@ -1,436 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-
-   base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'`
-   tmpdepfile1="$base.o.d"
-   tmpdepfile2="$base.d"
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    for arg
-    do
-      case "$arg" in
-      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-      *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-      esac
-    done
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/boehm-gc/digimars.mak b/boehm-gc/digimars.mak
deleted file mode 100644
index 9778feee976..00000000000
--- a/boehm-gc/digimars.mak
+++ /dev/null
@@ -1,90 +0,0 @@
-# Makefile to build Hans Boehm garbage collector using the Digital Mars

-# compiler from www.digitalmars.com

-# Written by Walter Bright

-

-

-DEFINES=-DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -D__STDC__ -DWIN32_THREADS

-CFLAGS=-Iinclude $(DEFINES) -wx -g

-LFLAGS=/ma/implib/co

-CC=sc

-

-.c.obj:

-	$(CC) -c $(CFLAGS) $*

-

-.cpp.obj:

-	$(CC) -c $(CFLAGS) -Aa $*

-

-OBJS=	\

-	allchblk.obj\

-	alloc.obj\

-	blacklst.obj\

-	checksums.obj\

-	dbg_mlc.obj\

-	dyn_load.obj\

-	finalize.obj\

-	gc_cpp.obj\

-	headers.obj\

-	mach_dep.obj\

-	malloc.obj\

-	mallocx.obj\

-	mark.obj\

-	mark_rts.obj\

-	misc.obj\

-	new_hblk.obj\

-	obj_map.obj\

-	os_dep.obj\

-	ptr_chck.obj\

-	reclaim.obj\

-	stubborn.obj\

-	typd_mlc.obj\

-	win32_threads.obj

-

-targets: gc.dll gc.lib gctest.exe

-

-gc.dll: $(OBJS) gc.def digimars.mak

-	sc -ogc.dll $(OBJS) -L$(LFLAGS) gc.def 	kernel32.lib user32.lib

-

-gc.def: digimars.mak

-	echo LIBRARY GC >gc.def

-	echo DESCRIPTION "Hans Boehm Garbage Collector" >>gc.def

-	echo EXETYPE NT	>>gc.def

-	echo EXPORTS >>gc.def

-	echo GC_is_visible_print_proc >>gc.def

-	echo GC_is_valid_displacement_print_proc >>gc.def

-

-clean:

-	del gc.def

-	del $(OBJS)

-

-

-gctest.exe : gc.lib tests\test.obj

-	sc -ogctest.exe tests\test.obj gc.lib

-

-tests\test.obj : tests\test.c

-	$(CC) -c -g -DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL \

-	-DALL_INTERIOR_POINTERS -DWIN32_THREADS \

-	-Iinclude tests\test.c -otests\test.obj

-

-allchblk.obj: allchblk.c

-alloc.obj: alloc.c

-blacklst.obj: blacklst.c

-checksums.obj: checksums.c

-dbg_mlc.obj: dbg_mlc.c

-dyn_load.obj: dyn_load.c

-finalize.obj: finalize.c

-gc_cpp.obj: gc_cpp.cpp

-headers.obj: headers.c

-mach_dep.obj: mach_dep.c

-malloc.obj: malloc.c

-mallocx.obj: mallocx.c

-mark.obj: mark.c

-mark_rts.obj: mark_rts.c

-misc.obj: misc.c

-new_hblk.obj: new_hblk.c

-obj_map.obj: obj_map.c

-os_dep.obj: os_dep.c

-ptr_chck.obj: ptr_chck.c

-reclaim.obj: reclaim.c

-stubborn.obj: stubborn.c

-typd_mlc.obj: typd_mlc.c

-win32_threads.obj: win32_threads.c

diff --git a/boehm-gc/doc/README b/boehm-gc/doc/README
deleted file mode 100644
index eaba6e509d3..00000000000
--- a/boehm-gc/doc/README
+++ /dev/null
@@ -1,622 +0,0 @@
-Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers
-Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
-Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
-Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
-
-The file linux_threads.c is also
-Copyright (c) 1998 by Fergus Henderson.  All rights reserved.
-
-The files Makefile.am, and configure.ac are
-Copyright (c) 2001 by Red Hat Inc. All rights reserved.
-
-Several files supporting GNU-style builds are copyrighted by the Free
-Software Foundation, and carry a different license from that given
-below.
-
-THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-
-Permission is hereby granted to use or copy this program
-for any purpose,  provided the above notices are retained on all copies.
-Permission to modify the code and to distribute modified code is granted,
-provided the above notices are retained, and a notice that the code was
-modified is included with the above copyright notice.
-
-A few of the files needed to use the GNU-style build procedure come with
-slightly different licenses, though they are all similar in spirit.  A few
-are GPL'ed, but with an exception that should cover all uses in the
-collector.  (If you are concerned about such things, I recommend you look
-at the notice in config.guess or ltmain.sh.)
-
-This is version 6.6 of a conservative garbage collector for C and C++.
-
-You might find a more recent version of this at
-
-http://www.hpl.hp.com/personal/Hans_Boehm/gc
-
-OVERVIEW
-
-    This is intended to be a general purpose, garbage collecting storage
-allocator.  The algorithms used are described in:
-
-Boehm, H., and M. Weiser, "Garbage Collection in an Uncooperative Environment",
-Software Practice & Experience, September 1988, pp. 807-820.
-
-Boehm, H., A. Demers, and S. Shenker, "Mostly Parallel Garbage Collection",
-Proceedings of the ACM SIGPLAN '91 Conference on Programming Language Design
-and Implementation, SIGPLAN Notices 26, 6 (June 1991), pp. 157-164.
-
-Boehm, H., "Space Efficient Conservative Garbage Collection", Proceedings
-of the ACM SIGPLAN '91 Conference on Programming Language Design and
-Implementation, SIGPLAN Notices 28, 6 (June 1993), pp. 197-206.
-
-Boehm H., "Reducing Garbage Collector Cache Misses", Proceedings of the
-2000 International Symposium on Memory Management.
-
-  Possible interactions between the collector and optimizing compilers are
-discussed in
-
-Boehm, H., and D. Chase, "A Proposal for GC-safe C Compilation",
-The Journal of C Language Translation 4, 2 (December 1992).
-
-and
-
-Boehm H., "Simple GC-safe Compilation", Proceedings
-of the ACM SIGPLAN '96 Conference on Programming Language Design and
-Implementation.
-
-(Some of these are also available from
-http://www.hpl.hp.com/personal/Hans_Boehm/papers/, among other places.)
-
-  Unlike the collector described in the second reference, this collector
-operates either with the mutator stopped during the entire collection
-(default) or incrementally during allocations.  (The latter is supported
-on only a few machines.)  On the most common platforms, it can be built
-with or without thread support.  On a few platforms, it can take advantage
-of a multiprocessor to speed up garbage collection.
-
-  Many of the ideas underlying the collector have previously been explored
-by others.  Notably, some of the run-time systems developed at Xerox PARC
-in the early 1980s conservatively scanned thread stacks to locate possible
-pointers (cf. Paul Rovner, "On Adding Garbage Collection and Runtime Types
-to a Strongly-Typed Statically Checked, Concurrent Language"  Xerox PARC
-CSL 84-7).  Doug McIlroy wrote a simpler fully conservative collector that
-was part of version 8 UNIX (tm), but appears to not have received
-widespread use.
-
-  Rudimentary tools for use of the collector as a leak detector are included
-(see http://www.hpl.hp.com/personal/Hans_Boehm/gc/leak.html),
-as is a fairly sophisticated string package "cord" that makes use of the
-collector.  (See doc/README.cords and H.-J. Boehm, R. Atkinson, and M. Plass,
-"Ropes: An Alternative to Strings", Software Practice and Experience 25, 12
-(December 1995), pp. 1315-1330.  This is very similar to the "rope" package
-in Xerox Cedar, or the "rope" package in the SGI STL or the g++ distribution.)
-
-Further collector documantation can be found at
-
-http://www.hpl.hp.com/personal/Hans_Boehm/gc
-
-
-GENERAL DESCRIPTION
-
-  This is a garbage collecting storage allocator that is intended to be
-used as a plug-in replacement for C's malloc.
-
-  Since the collector does not require pointers to be tagged, it does not
-attempt to ensure that all inaccessible storage is reclaimed.  However,
-in our experience, it is typically more successful at reclaiming unused
-memory than most C programs using explicit deallocation.  Unlike manually
-introduced leaks, the amount of unreclaimed memory typically stays
-bounded.
-
-  In the following, an "object" is defined to be a region of memory allocated
-by the routines described below.  
-
-  Any objects not intended to be collected must be pointed to either
-from other such accessible objects, or from the registers,
-stack, data, or statically allocated bss segments.  Pointers from
-the stack or registers may point to anywhere inside an object.
-The same is true for heap pointers if the collector is compiled with
- ALL_INTERIOR_POINTERS defined, as is now the default.
-
-Compiling without ALL_INTERIOR_POINTERS may reduce accidental retention
-of garbage objects, by requiring pointers from the heap to to the beginning
-of an object.  But this no longer appears to be a significant
-issue for most programs.
-
-There are a number of routines which modify the pointer recognition
-algorithm.  GC_register_displacement allows certain interior pointers
-to be recognized even if ALL_INTERIOR_POINTERS is nor defined.
-GC_malloc_ignore_off_page allows some pointers into the middle of large objects
-to be disregarded, greatly reducing the probablility of accidental
-retention of large objects.  For most purposes it seems best to compile
-with ALL_INTERIOR_POINTERS and to use GC_malloc_ignore_off_page if
-you get collector warnings from allocations of very large objects.
-See README.debugging for details.
-
-  WARNING: pointers inside memory allocated by the standard "malloc" are not
-seen by the garbage collector.  Thus objects pointed to only from such a
-region may be prematurely deallocated.  It is thus suggested that the
-standard "malloc" be used only for memory regions, such as I/O buffers, that
-are guaranteed not to contain pointers to garbage collectable memory.
-Pointers in C language automatic, static, or register variables,
-are correctly recognized.  (Note that GC_malloc_uncollectable has semantics
-similar to standard malloc, but allocates objects that are traced by the
-collector.)
-
-  WARNING: the collector does not always know how to find pointers in data
-areas that are associated with dynamic libraries.  This is easy to
-remedy IF you know how to find those data areas on your operating
-system (see GC_add_roots).  Code for doing this under SunOS, IRIX 5.X and 6.X,
-HP/UX, Alpha OSF/1, Linux, and win32 is included and used by default.  (See
-README.win32 for win32 details.)  On other systems pointers from dynamic
-library data areas may not be considered by the collector.
-If you're writing a program that depends on the collector scanning
-dynamic library data areas, it may be a good idea to include at least
-one call to GC_is_visible() to ensure that those areas are visible
-to the collector.
-
-  Note that the garbage collector does not need to be informed of shared
-read-only data.  However if the shared library mechanism can introduce
-discontiguous data areas that may contain pointers, then the collector does
-need to be informed.
-
-  Signal processing for most signals may be deferred during collection,
-and during uninterruptible parts of the allocation process.
-Like standard ANSI C mallocs, by default it is unsafe to invoke
-malloc (and other GC routines) from a signal handler while another
-malloc call may be in progress. Removing -DNO_SIGNALS from Makefile
-attempts to remedy that.  But that may not be reliable with a compiler that
-substantially reorders memory operations inside GC_malloc.
-
-  The allocator/collector can also be configured for thread-safe operation.
-(Full signal safety can also be achieved, but only at the cost of two system
-calls per malloc, which is usually unacceptable.)
-WARNING: the collector does not guarantee to scan thread-local storage
-(e.g. of the kind accessed with pthread_getspecific()).  The collector
-does scan thread stacks, though, so generally the best solution is to
-ensure that any pointers stored in thread-local storage are also
-stored on the thread's stack for the duration of their lifetime.
-(This is arguably a longstanding bug, but it hasn't been fixed yet.)
-
-INSTALLATION AND PORTABILITY
-
-  As distributed, the macro SILENT is defined in Makefile.
-In the event of problems, this can be removed to obtain a moderate
-amount of descriptive output for each collection.
-(The given statistics exhibit a few peculiarities.
-Things don't appear to add up for a variety of reasons, most notably
-fragmentation losses.  These are probably much more significant for the
-contrived program "test.c" than for your application.)
-
-  Note that typing "make test" will automatically build the collector
-and then run setjmp_test and gctest. Setjmp_test will give you information
-about configuring the collector, which is useful primarily if you have
-a machine that's not already supported.  Gctest is a somewhat superficial
-test of collector functionality.  Failure is indicated by a core dump or
-a message to the effect that the collector is broken.  Gctest takes about 
-35 seconds to run on a SPARCstation 2. It may use up to 8 MB of memory.  (The
-multi-threaded version will use more.  64-bit versions may use more.)
-"Make test" will also, as its last step, attempt to build and test the
-"cord" string library.  This will fail without an ANSI C compiler, but
-the garbage collector itself should still be usable.
-
-  The Makefile will generate a library gc.a which you should link against.
-Typing "make cords" will add the cord library to gc.a.
-Note that this requires an ANSI C compiler.
-
-  It is suggested that if you need to replace a piece of the collector
-(e.g. GC_mark_rts.c) you simply list your version ahead of gc.a on the
-ld command line, rather than replacing the one in gc.a.  (This will
-generate numerous warnings under some versions of AIX, but it still
-works.)
-
-  All include files that need to be used by clients will be put in the
-include subdirectory.  (Normally this is just gc.h.  "Make cords" adds
-"cord.h" and "ec.h".)
-
-  The collector currently is designed to run essentially unmodified on
-machines that use a flat 32-bit or 64-bit address space.
-That includes the vast majority of Workstations and X86 (X >= 3) PCs.
-(The list here was deleted because it was getting too long and constantly
-out of date.)
-  It does NOT run under plain 16-bit DOS or Windows 3.X.  There are however
-various packages (e.g. win32s, djgpp) that allow flat 32-bit address
-applications to run under those systemsif the have at least an 80386 processor,
-and several of those are compatible with the collector.
-
-  In a few cases (Amiga, OS/2, Win32, MacOS) a separate makefile
-or equivalent is supplied.  Many of these have separate README.system
-files.
-
-  Dynamic libraries are completely supported only under SunOS/Solaris,
-(and even that support is not functional on the last Sun 3 release),
-Linux, FreeBSD, NetBSD, IRIX 5&6, HP/UX, Win32 (not Win32S) and OSF/1
-on DEC AXP machines plus perhaps a few others listed near the top
-of dyn_load.c.  On other machines we recommend that you do one of
-the following:
-
-  1) Add dynamic library support (and send us the code).
-  2) Use static versions of the libraries.
-  3) Arrange for dynamic libraries to use the standard malloc.
-     This is still dangerous if the library stores a pointer to a
-     garbage collected object.  But nearly all standard interfaces
-     prohibit this, because they deal correctly with pointers
-     to stack allocated objects.  (Strtok is an exception.  Don't
-     use it.)
-
-  In all cases we assume that pointer alignment is consistent with that
-enforced by the standard C compilers.  If you use a nonstandard compiler
-you may have to adjust the alignment parameters defined in gc_priv.h.
-Note that this may also be an issue with packed records/structs, if those
-enforce less alignment for pointers.
-
-  A port to a machine that is not byte addressed, or does not use 32 bit
-or 64 bit addresses will require a major effort.  A port to plain MSDOS
-or win16 is hard.
-
-  For machines not already mentioned, or for nonstandard compilers, the
-following are likely to require change:
-
-1.  The parameters in gcconfig.h.
-      The parameters that will usually require adjustment are
-   STACKBOTTOM,  ALIGNMENT and DATASTART.  Setjmp_test
-   prints its guesses of the first two.
-      DATASTART should be an expression for computing the
-   address of the beginning of the data segment.  This can often be
-   &etext.  But some memory management units require that there be
-   some unmapped space between the text and the data segment.  Thus
-   it may be more complicated.   On UNIX systems, this is rarely
-   documented.  But the adb "$m" command may be helpful.  (Note
-   that DATASTART will usually be a function of &etext.  Thus a
-   single experiment is usually insufficient.)
-     STACKBOTTOM is used to initialize GC_stackbottom, which
-   should be a sufficient approximation to the coldest stack address.
-   On some machines, it is difficult to obtain such a value that is
-   valid across a variety of MMUs, OS releases, etc.  A number of
-   alternatives exist for using the collector in spite of this.  See the
-   discussion in gcconfig.h immediately preceding the various
-   definitions of STACKBOTTOM.
-   
-2.  mach_dep.c.
-      The most important routine here is one to mark from registers.
-    The distributed file includes a generic hack (based on setjmp) that
-    happens to work on many machines, and may work on yours.  Try
-    compiling and running setjmp_t.c to see whether it has a chance of
-    working.  (This is not correct C, so don't blame your compiler if it
-    doesn't work.  Based on limited experience, register window machines
-    are likely to cause trouble.  If your version of setjmp claims that
-    all accessible variables, including registers, have the value they
-    had at the time of the longjmp, it also will not work.  Vanilla 4.2 BSD
-    on Vaxen makes such a claim.  SunOS does not.)
-      If your compiler does not allow in-line assembly code, or if you prefer
-    not to use such a facility, mach_dep.c may be replaced by a .s file
-    (as we did for the MIPS machine and the PC/RT).
-      At this point enough architectures are supported by mach_dep.c
-    that you will rarely need to do more than adjust for assembler
-    syntax.
-
-3.  os_dep.c (and gc_priv.h).
-  	  Several kinds of operating system dependent routines reside here.
-  	Many are optional.  Several are invoked only through corresponding
-  	macros in gc_priv.h, which may also be redefined as appropriate.
-      The routine GC_register_data_segments is crucial.  It registers static
-    data areas that must be traversed by the collector. (User calls to
-    GC_add_roots may sometimes be used for similar effect.)
-      Routines to obtain memory from the OS also reside here.
-    Alternatively this can be done entirely by the macro GET_MEM
-    defined in gc_priv.h.  Routines to disable and reenable signals
-    also reside here if they are need by the macros DISABLE_SIGNALS
-    and ENABLE_SIGNALS defined in gc_priv.h.
-      In a multithreaded environment, the macros LOCK and UNLOCK
-    in gc_priv.h will need to be suitably redefined.
-      The incremental collector requires page dirty information, which
-    is acquired through routines defined in os_dep.c.  Unless directed
-    otherwise by gcconfig.h, these are implemented as stubs that simply
-    treat all pages as dirty.  (This of course makes the incremental
-    collector much less useful.)
-
-4.  dyn_load.c
-	This provides a routine that allows the collector to scan data
-	segments associated with dynamic libraries.  Often it is not
-	necessary to provide this routine unless user-written dynamic
-	libraries are used.
-
-  For a different version of UN*X or different machines using the
-Motorola 68000, Vax, SPARC, 80386, NS 32000, PC/RT, or MIPS architecture,
-it should frequently suffice to change definitions in gcconfig.h.
-
-
-THE C INTERFACE TO THE ALLOCATOR
-
-  The following routines are intended to be directly called by the user.
-Note that usually only GC_malloc is necessary.  GC_clear_roots and GC_add_roots
-calls may be required if the collector has to trace from nonstandard places
-(e.g. from dynamic library data areas on a machine on which the 
-collector doesn't already understand them.)  On some machines, it may
-be desirable to set GC_stacktop to a good approximation of the stack base. 
-(This enhances code portability on HP PA machines, since there is no
-good way for the collector to compute this value.)  Client code may include
-"gc.h", which defines all of the following, plus many others.
-
-1)  GC_malloc(nbytes)
-    - allocate an object of size nbytes.  Unlike malloc, the object is
-      cleared before being returned to the user.  Gc_malloc will
-      invoke the garbage collector when it determines this to be appropriate.
-      GC_malloc may return 0 if it is unable to acquire sufficient
-      space from the operating system.  This is the most probable
-      consequence of running out of space.  Other possible consequences
-      are that a function call will fail due to lack of stack space,
-      or that the collector will fail in other ways because it cannot
-      maintain its internal data structures, or that a crucial system
-      process will fail and take down the machine.  Most of these
-      possibilities are independent of the malloc implementation.
-
-2)  GC_malloc_atomic(nbytes)
-    - allocate an object of size nbytes that is guaranteed not to contain any
-      pointers.  The returned object is not guaranteed to be cleared.
-      (Can always be replaced by GC_malloc, but results in faster collection
-      times.  The collector will probably run faster if large character
-      arrays, etc. are allocated with GC_malloc_atomic than if they are
-      statically allocated.)
-
-3)  GC_realloc(object, new_size)
-    - change the size of object to be new_size.  Returns a pointer to the
-      new object, which may, or may not, be the same as the pointer to
-      the old object.  The new object is taken to be atomic iff the old one
-      was.  If the new object is composite and larger than the original object,
-      then the newly added bytes are cleared (we hope).  This is very likely
-      to allocate a new object, unless MERGE_SIZES is defined in gc_priv.h.
-      Even then, it is likely to recycle the old object only if the object
-      is grown in small additive increments (which, we claim, is generally bad
-      coding practice.)
-
-4)  GC_free(object)
-    - explicitly deallocate an object returned by GC_malloc or
-      GC_malloc_atomic.  Not necessary, but can be used to minimize
-      collections if performance is critical.  Probably a performance
-      loss for very small objects (<= 8 bytes).
-
-5)  GC_expand_hp(bytes)
-    - Explicitly increase the heap size.  (This is normally done automatically
-      if a garbage collection failed to GC_reclaim enough memory.  Explicit
-      calls to GC_expand_hp may prevent unnecessarily frequent collections at
-      program startup.)
-
-6)  GC_malloc_ignore_off_page(bytes)
-	- identical to GC_malloc, but the client promises to keep a pointer to
-	  the somewhere within the first 256 bytes of the object while it is
-	  live.  (This pointer should nortmally be declared volatile to prevent
-	  interference from compiler optimizations.)  This is the recommended
-	  way to allocate anything that is likely to be larger than 100Kbytes
-	  or so.  (GC_malloc may result in failure to reclaim such objects.)
-
-7)  GC_set_warn_proc(proc)
-	- Can be used to redirect warnings from the collector.  Such warnings
-	  should be rare, and should not be ignored during code development.
-      
-8) GC_enable_incremental()
-    - Enables generational and incremental collection.  Useful for large
-      heaps on machines that provide access to page dirty information.
-      Some dirty bit implementations may interfere with debugging
-      (by catching address faults) and place restrictions on heap arguments
-      to system calls (since write faults inside a system call may not be
-      handled well).
-
-9) Several routines to allow for registration of finalization code.
-   User supplied finalization code may be invoked when an object becomes
-   unreachable.  To call (*f)(obj, x) when obj becomes inaccessible, use
-	GC_register_finalizer(obj, f, x, 0, 0);
-   For more sophisticated uses, and for finalization ordering issues,
-   see gc.h.
-
-  The global variable GC_free_space_divisor may be adjusted up from its
-default value of 4 to use less space and more collection time, or down for
-the opposite effect.  Setting it to 1 or 0 will effectively disable collections
-and cause all allocations to simply grow the heap.
-
-  The variable GC_non_gc_bytes, which is normally 0, may be changed to reflect
-the amount of memory allocated by the above routines that should not be
-considered as a candidate for collection.  Careless use may, of course, result
-in excessive memory consumption.
-
-  Some additional tuning is possible through the parameters defined
-near the top of gc_priv.h.
-  
-  If only GC_malloc is intended to be used, it might be appropriate to define:
-
-#define malloc(n) GC_malloc(n)
-#define calloc(m,n) GC_malloc((m)*(n))
-
-  For small pieces of VERY allocation intensive code, gc_inl.h
-includes some allocation macros that may be used in place of GC_malloc
-and friends.
-
-  All externally visible names in the garbage collector start with "GC_".
-To avoid name conflicts, client code should avoid this prefix, except when
-accessing garbage collector routines or variables.
-
-  There are provisions for allocation with explicit type information.
-This is rarely necessary.  Details can be found in gc_typed.h.
-
-THE C++ INTERFACE TO THE ALLOCATOR:
-
-  The Ellis-Hull C++ interface to the collector is included in
-the collector distribution.  If you intend to use this, type
-"make c++" after the initial build of the collector is complete.
-See gc_cpp.h for the definition of the interface.  This interface
-tries to approximate the Ellis-Detlefs C++ garbage collection
-proposal without compiler changes.
-
-Cautions:
-1. Arrays allocated without new placement syntax are
-allocated as uncollectable objects.  They are traced by the
-collector, but will not be reclaimed.
-
-2. Failure to use "make c++" in combination with (1) will
-result in arrays allocated using the default new operator.
-This is likely to result in disaster without linker warnings.
-
-3. If your compiler supports an overloaded new[] operator,
-then gc_cpp.cc and gc_cpp.h should be suitably modified.
-
-4. Many current C++ compilers have deficiencies that
-break some of the functionality.  See the comments in gc_cpp.h
-for suggested workarounds.
-
-USE AS LEAK DETECTOR:
-
-  The collector may be used to track down leaks in C programs that are
-intended to run with malloc/free (e.g. code with extreme real-time or
-portability constraints).  To do so define FIND_LEAK in Makefile
-This will cause the collector to invoke the report_leak
-routine defined near the top of reclaim.c whenever an inaccessible
-object is found that has not been explicitly freed.  Such objects will
-also be automatically reclaimed.
-  Productive use of this facility normally involves redefining report_leak
-to do something more intelligent.  This typically requires annotating
-objects with additional information (e.g. creation time stack trace) that
-identifies their origin.  Such code is typically not very portable, and is
-not included here, except on SPARC machines.
-  If all objects are allocated with GC_DEBUG_MALLOC (see next section),
-then the default version of report_leak will report the source file
-and line number at which the leaked object was allocated.  This may
-sometimes be sufficient.  (On SPARC/SUNOS4 machines, it will also report
-a cryptic stack trace.  This can often be turned into a sympolic stack
-trace by invoking program "foo" with "callprocs foo".  Callprocs is
-a short shell script that invokes adb to expand program counter values
-to symbolic addresses.  It was largely supplied by Scott Schwartz.)
-  Note that the debugging facilities described in the next section can
-sometimes be slightly LESS effective in leak finding mode, since in
-leak finding mode, GC_debug_free actually results in reuse of the object.
-(Otherwise the object is simply marked invalid.)  Also note that the test
-program is not designed to run meaningfully in FIND_LEAK mode.
-Use "make gc.a" to build the collector.
-
-DEBUGGING FACILITIES:
-
-  The routines GC_debug_malloc, GC_debug_malloc_atomic, GC_debug_realloc,
-and GC_debug_free provide an alternate interface to the collector, which
-provides some help with memory overwrite errors, and the like.
-Objects allocated in this way are annotated with additional
-information.  Some of this information is checked during garbage
-collections, and detected inconsistencies are reported to stderr.
-
-  Simple cases of writing past the end of an allocated object should
-be caught if the object is explicitly deallocated, or if the
-collector is invoked while the object is live.  The first deallocation
-of an object will clear the debugging info associated with an
-object, so accidentally repeated calls to GC_debug_free will report the
-deallocation of an object without debugging information.  Out of
-memory errors will be reported to stderr, in addition to returning
-NIL.
-
-  GC_debug_malloc checking  during garbage collection is enabled
-with the first call to GC_debug_malloc.  This will result in some
-slowdown during collections.  If frequent heap checks are desired,
-this can be achieved by explicitly invoking GC_gcollect, e.g. from
-the debugger.
-
-  GC_debug_malloc allocated objects should not be passed to GC_realloc
-or GC_free, and conversely.  It is however acceptable to allocate only
-some objects with GC_debug_malloc, and to use GC_malloc for other objects,
-provided the two pools are kept distinct.  In this case, there is a very
-low probablility that GC_malloc allocated objects may be misidentified as
-having been overwritten.  This should happen with probability at most
-one in 2**32.  This probability is zero if GC_debug_malloc is never called.
-
-  GC_debug_malloc, GC_malloc_atomic, and GC_debug_realloc take two
-additional trailing arguments, a string and an integer.  These are not
-interpreted by the allocator.  They are stored in the object (the string is
-not copied).  If an error involving the object is detected, they are printed.
-
-  The macros GC_MALLOC, GC_MALLOC_ATOMIC, GC_REALLOC, GC_FREE, and
-GC_REGISTER_FINALIZER are also provided.  These require the same arguments
-as the corresponding (nondebugging) routines.  If gc.h is included
-with GC_DEBUG defined, they call the debugging versions of these
-functions, passing the current file name and line number as the two
-extra arguments, where appropriate.  If gc.h is included without GC_DEBUG
-defined, then all these macros will instead be defined to their nondebugging
-equivalents.  (GC_REGISTER_FINALIZER is necessary, since pointers to
-objects with debugging information are really pointers to a displacement
-of 16 bytes form the object beginning, and some translation is necessary
-when finalization routines are invoked.  For details, about what's stored
-in the header, see the definition of the type oh in debug_malloc.c)
-
-INCREMENTAL/GENERATIONAL COLLECTION:
-
-The collector normally interrupts client code for the duration of 
-a garbage collection mark phase.  This may be unacceptable if interactive
-response is needed for programs with large heaps.  The collector
-can also run in a "generational" mode, in which it usually attempts to
-collect only objects allocated since the last garbage collection.
-Furthermore, in this mode, garbage collections run mostly incrementally,
-with a small amount of work performed in response to each of a large number of
-GC_malloc requests.
-
-This mode is enabled by a call to GC_enable_incremental().
-
-Incremental and generational collection is effective in reducing
-pause times only if the collector has some way to tell which objects
-or pages have been recently modified.  The collector uses two sources
-of information:
-
-1. Information provided by the VM system.  This may be provided in
-one of several forms.  Under Solaris 2.X (and potentially under other
-similar systems) information on dirty pages can be read from the
-/proc file system.  Under other systems (currently SunOS4.X) it is
-possible to write-protect the heap, and catch the resulting faults.
-On these systems we require that system calls writing to the heap
-(other than read) be handled specially by client code.
-See os_dep.c for details.
-
-2. Information supplied by the programmer.  We define "stubborn"
-objects to be objects that are rarely changed.  Such an object
-can be allocated (and enabled for writing) with GC_malloc_stubborn.
-Once it has been initialized, the collector should be informed with
-a call to GC_end_stubborn_change.  Subsequent writes that store
-pointers into the object must be preceded by a call to
-GC_change_stubborn.
-
-This mechanism performs best for objects that are written only for
-initialization, and such that only one stubborn object is writable
-at once.  It is typically not worth using for short-lived
-objects.  Stubborn objects are treated less efficiently than pointerfree
-(atomic) objects.
-
-A rough rule of thumb is that, in the absence of VM information, garbage
-collection pauses are proportional to the amount of pointerful storage
-plus the amount of modified "stubborn" storage that is reachable during
-the collection.  
-
-Initial allocation of stubborn objects takes longer than allocation
-of other objects, since other data structures need to be maintained.
-
-We recommend against random use of stubborn objects in client
-code, since bugs caused by inappropriate writes to stubborn objects
-are likely to be very infrequently observed and hard to trace.  
-However, their use may be appropriate in a few carefully written
-library routines that do not make the objects themselves available
-for writing by client code.
-
-
-BUGS:
-
-  Any memory that does not have a recognizable pointer to it will be
-reclaimed.  Exclusive-or'ing forward and backward links in a list
-doesn't cut it.
-  Some C optimizers may lose the last undisguised pointer to a memory
-object as a consequence of clever optimizations.  This has almost
-never been observed in practice.  Send mail to boehm@acm.org
-for suggestions on how to fix your compiler.
-  This is not a real-time collector.  In the standard configuration,
-percentage of time required for collection should be constant across
-heap sizes.  But collection pauses will increase for larger heaps.
-(On SPARCstation 2s collection times will be on the order of 300 msecs
-per MB of accessible memory that needs to be scanned.  Your mileage
-may vary.)  The incremental/generational collection facility helps,
-but is portable only if "stubborn" allocation is used.
-  Please address bug reports to boehm@acm.org.  If you are
-contemplating a major addition, you might also send mail to ask whether
-it's already been done (or whether we tried and discarded it).
-
diff --git a/boehm-gc/doc/README.DGUX386 b/boehm-gc/doc/README.DGUX386
deleted file mode 100644
index 9d6d84788ef..00000000000
--- a/boehm-gc/doc/README.DGUX386
+++ /dev/null
@@ -1,215 +0,0 @@
-    Garbage Collector (parallel iversion) for ix86 DG/UX Release R4.20MU07
-
-
-     *READ* the file README.QUICK.
-
-     You need the GCC-3.0.3 rev (DG/UX) compiler to build this tree.
-     This compiler has the new "dgux386" threads package implemented.
-     It also supports the switch "-pthread" needed to link correctly
-     the DG/UX's -lrte -lthread with -lgcc and the system's -lc. 
-     Finally we support parralleli-mark for the SMP DG/UX machines.
-     To build the garbage collector do:
-      
-      ./configure --enable-parallel-mark
-      make
-      make gctest
-
-     Before you run "gctest" you need to set your LD_LIBRARY_PATH
-     correctly so that "gctest" can find the shared library libgc.
-     Alternatively you can do a configuration
-
-      ./configure --enable-parallel-mark --disable-shared
-  
-     to build only the static version of libgc.
-  
-     To enable debugging messages please do:
-     1) Add the "--enable-full-debug" flag during configuration. 
-     2) Edit the file linux-threads.c and uncommnect the line:
-
-     /* #define DEBUG_THREADS 1 */ to ---> 
-
-     #define DEBUG_THREADS 1
-
-     Then give "make" as usual.
-    
-     In a machine with 4 CPUs (my own machine) the option parallel
-     mark (aka --enable-parallel-mark) makes a BIG difference.
-
-     Takis Psarogiannakopoulos
-     University of Cambridge
-     Centre for Mathematical Sciences
-     Department of Pure Mathematics
-     Wilberforce Road
-     Cambridge CB3 0WB ,UK , <takis@XFree86.Org>
-     January 2002
-
-
-Note (HB):
-     The integration of this patch is currently not complete.
-     The following patches against 6.1alpha3 where hard to move
-     to alpha4, and are not integrated.  There may also be minor
-     problems with stylistic corrections made by me.
-
-
---- ltconfig.ORIG	Mon Jan 28 20:22:18 2002
-+++ ltconfig	Mon Jan 28 20:44:00 2002
-@@ -689,6 +689,11 @@
-        pic_flag=-Kconform_pic
-     fi
-     ;;
-+  dgux*)
-+    pic_flag='-fPIC'
-+    link_static='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-   *)
-     pic_flag='-fPIC'
-     ;;
-@@ -718,6 +723,12 @@
-     # We can build DLLs from non-PIC.
-     ;;
- 
-+  dgux*)
-+    pic_flag='-KPIC'
-+    link_static='-Bstatic'
-+    wl='-Wl,'
-+    ;;
-+
-   osf3* | osf4* | osf5*)
-     # All OSF/1 code is PIC.
-     wl='-Wl,'
-@@ -1154,6 +1165,22 @@
-     fi
-     ;;
- 
-+  dgux*)
-+    ld_shlibs=yes
-+    # For both C/C++ ommit the deplibs. This is because we relying on the fact
-+    # that compilation of execitables will put them in correct order
-+    # in any case and sometimes are wrong when listed as deplibs (or missing some deplibs)
-+    # However when GNU ld and --whole-archive needs to be used we have the problem
-+    # that if the -fPIC *_s.a archive is linked through deplibs list we ommiting crucial
-+    # .lo/.o files from the created shared lib. This I think is not the case here.
-+    archive_cmds='$CC -shared -h $soname -o $lib $libobjs $linkopts'
-+    thread_safe_flag_spec='-pthread'
-+    wlarc=
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ac_cv_archive_cmds_needs_lc=no
-+    ;;
-+
-   cygwin* | mingw*)
-     # hardcode_libdir_flag_spec is actually meaningless, as there is
-     # no search path for DLLs.
-@@ -1497,7 +1524,7 @@
-     ;;
- 
-   dgux*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-+    archive_cmds='$CC -shared -h $soname -o $lib $libobjs $linkopts'
-     hardcode_libdir_flag_spec='-L$libdir'
-     hardcode_shlibpath_var=no
-     ;;
-@@ -2092,12 +2119,17 @@
-   ;;
- 
- dgux*)
--  version_type=linux
-+  version_type=dgux
-   need_lib_prefix=no
-   need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='$libname.so$versuffix'
-+  soname_spec='$libname.so$versuffix'
-   shlibpath_var=LD_LIBRARY_PATH
-+  thread_safe_flag_spec='-pthread'
-+  wlarc=
-+  hardcode_libdir_flag_spec='-L$libdir'
-+  hardcode_shlibpath_var=no
-+  ac_cv_archive_cmds_needs_lc=no
-   ;;
- 
- sysv4*MP*)
-
-
---- ltmain.sh.ORIG	Mon Jan 28 20:31:18 2002
-+++ ltmain.sh	Tue Jan 29 00:11:29 2002
-@@ -1072,11 +1072,38 @@
- 	esac
- 	;;
- 
-+      -thread*)
-+	# DG/UX GCC 2.95.x, 3.x.x rev (DG/UX) links -lthread
-+	# with the switch -threads
-+	if test "$arg" = "-threads"; then
-+	  case "$host" in
-+	  i[3456]86-*-dgux*)
-+	    deplibs="$deplibs $arg"
-+	    continue
-+	    ;;
-+	  esac
-+	fi
-+	;;
-+
-+      -pthread*)
-+	# DG/UX GCC 2.95.x, 3.x.x rev (DG/UX) links -lthread
-+	# with the switch -pthread
-+	if test "$arg" = "-pthread"; then
-+	  case "$host" in
-+	  i[3456]86-*-dgux*)
-+	    deplibs="$deplibs $arg"
-+	    continue
-+	    ;;
-+	  esac
-+	fi
-+	;;
-+
-       -l*)
- 	if test "$arg" = "-lc"; then
- 	  case "$host" in
--	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* | i[3456]86-*-dgux*)
- 	    # These systems don't actually have c library (as such)
-+	    # It is wrong in DG/UX to add -lc when creating shared/dynamic objs/libs
- 	    continue
- 	    ;;
- 	  esac
-@@ -1248,6 +1275,12 @@
- 	  temp_deplibs=
- 	  for deplib in $dependency_libs; do
- 	    case "$deplib" in
-+	    -thread*)
-+		 temp_deplibs="$temp_deplibs $deplib"
-+		 ;;
-+	    -pthread)
-+		 temp_deplibs="$temp_deplibs $deplib"
-+		 ;;
- 	    -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
- 		 case " $rpath $xrpath " in
- 		 *" $temp_xrpath "*) ;;
-@@ -1709,6 +1742,13 @@
- 	  done
- 	  ;;
- 
-+	dgux)
-+	  # Leave mostly blank for DG/UX
-+	  major=
-+	  versuffix=".$current.$revision";
-+	  verstring=
-+	  ;;
-+
- 	linux)
- 	  major=.`expr $current - $age`
- 	  versuffix="$major.$age.$revision"
-@@ -1792,8 +1832,9 @@
- 
- 	dependency_libs="$deplibs"
- 	case "$host" in
--	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
-+	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* | i[3456]86-*-dgux*)
- 	  # these systems don't actually have a c library (as such)!
-+	  # It is wrong in DG/UX to add -lc when creating shared/dynamic objs/libs
- 	  ;;
- 	*)
- 	  # Add libc to deplibs on all other systems.
diff --git a/boehm-gc/doc/README.Mac b/boehm-gc/doc/README.Mac
deleted file mode 100644
index 04f468251a1..00000000000
--- a/boehm-gc/doc/README.Mac
+++ /dev/null
@@ -1,385 +0,0 @@
-Patrick Beard's Notes for building GC v4.12 with CodeWarrior Pro 2:
-----------------------------------------------------------------------------
-The current build environment for the collector is CodeWarrior Pro 2.
-Projects for CodeWarrior Pro 2 (and for quite a few older versions)
-are distributed in the file Mac_projects.sit.hqx. The project file
-:Mac_projects:gc.prj builds static library versions of the collector.
-:Mac_projects:gctest.prj builds the GC test suite.
-
-Configuring the collector is still done by editing the files
-:Mac_files:MacOS_config.h and :Mac_files:MacOS_Test_config.h.
-
-Lars Farm's suggestions on building the collector:
-----------------------------------------------------------------------------
-Garbage Collection on MacOS - a manual 'MakeFile'
--------------------------------------------------
-
-Project files and IDE's are great on the Macintosh, but they do have
-problems when used as distribution media. This note tries to provide
-porting instructions in pure TEXT form to avoid those problems. A manual
-'makefile' if you like.
-
-    GC version:     4.12a2
-    Codewarrior:    CWPro1
-    date:           18 July 1997
-
-The notes may or may not apply to earlier or later versions of the
-GC/CWPro. Actually, they do apply to earlier versions of both except that
-until recently a project could only build one target so each target was a
-separate project. The notes will most likely apply to future versions too.
-Possibly with minor tweaks.
-
-This is just to record my experiences. These notes do not mean I now
-provide a supported port of the GC to MacOS. It works for me. If it works
-for you, great. If it doesn't, sorry, try again...;-) Still, if you find
-errors, please let me know.
-
-    mailto:         lars.farm@ite.mh.se
-
-    address:        Lars Farm
-                    Krönvägen 33b
-                    856 44 Sundsvall
-                    Sweden
-
-Porting to MacOS is a bit more complex than it first seems. Which MacOS?
-68K/PowerPC? Which compiler? Each supports both 68K and PowerPC and offer a
-large number of (unique to each environment) compiler settings. Each
-combination of compiler/68K/PPC/settings require a unique combination of
-standard libraries. And the IDE's does not select them for you. They don't
-even check that the library is built with compatible setting and this is
-the major source of problems when porting the GC (and otherwise too).
-
-You will have to make choices when you configure the GC. I've made some
-choices here, but there are other combinations of settings and #defines
-that work too.
-
-As for target settings the major obstacles may be:
-- 68K Processor: check "4-byte Ints".
-- PPC Processor: uncheck "Store Static Data in TOC".
-
-What you need to do:
-===================
-
-1) Build the GC as a library
-2) Test that the library works with 'test.c'.
-3) Test that the C++ interface 'gc_cpp.cc/h' works with 'test_cpp.cc'.
-
-1) The Libraries:
-=================
-I made one project with four targets (68K/PPC tempmem or appheap). One target
-will suffice if you're able to decide which one you want. I wasn't...
-
-Codewarrior allows a large number of compiler/linker settings. I used these:
-
-Settings shared by all targets:
-------------------------------
-o Access Paths:
-  - User Paths:   the GC folder
-  - System Paths: {Compiler}:Metrowerks Standard Library:
-                  {Compiler}:MacOS Support:Headers:
-                  {Compiler}:MacOS Support:MacHeaders:
-o C/C++ language:
-  - inlining: normal
-  - direct to SOM: off
-  - enable/check: exceptions, RTTI, bool (and if you like pool strings)
-
-PowerPC target settings
------------------------
-o Target Settings:
-  - name of target
-  - MacOS PPC Linker
-o PPC Target
-  - name of library
-o C/C++ language
-  - prefix file as described below
-o PPC Processor
-  - Struct Alignment: PowerPC
-  - uncheck "Store Static Data in TOC" -- important!
-    I don't think the others matter, I use full optimization and its ok
-o PPC Linker
-  - Factory Settings (SYM file with full paths, faster linking, dead-strip
-    static init, Main: __start)
-
-
-68K target settings
--------------------
-o Target Settings:
-  - name of target
-  - MacOS 68K Linker
-o 68K Target
-  - name of library
-  - A5 relative data
-o C/C++ language
-  - prefix file as described below
-o 68K Processor
-  - Code model: smart
-  - Struct alignment: 68K
-  - FP: SANE
-  - enable 4-Byte Ints -- important!
-    I don't think the others matter. I selected...
-  - enable: 68020
-  - enable: global register allocation
-o IR Optimizer
-  - enable: Optimize Space, Optimize Speed
-    I suppose the others would work too, but haven't tried...
-o 68K Linker
-  - Factory Settings (New Style MacsBug,SYM file with full paths,
-    A6 Frames, fast link, Merge compiler glue into segment 1,
-    dead-strip static init)
-
-Prefix Files to configure the GC sources
-----------------------------------------
-The Codewarrior equivalent of commandline compilers -DNAME=X is to use
-prefix-files. A TEXT file that is automatically #included before the first byte
-of every source file. I used these:
-
----- ( cut here ) ----  gc_prefix_tempmem.h     -- 68K and PPC -----
-    #include "gc_prefix_common.h"
-    #undef USE_TEMPORARY_MEMORY
-    #define USE_TEMPORARY_MEMORY
----- ( cut here ) ----  gc_prefix_appmem.h      -- 68K and PPC -----
-    #include "gc_prefix_common.h"
-    #undef USE_TEMPORARY_MEMORY
-//  #define USE_TEMPORARY_MEMORY
-
----- ( cut here ) ----  gc_prefix_common.h      --------------------
-// gc_prefix_common.h
-// ------------------
-// Codewarrior prefix file to configure the GC libraries
-//
-//   prefix files are the Codewarrior equivalent of the
-//   command line option -Dname=x frequently seen in makefiles
-
-#if !__MWERKS__
-  #error only tried this with Codewarrior
-#endif
-
-#if macintosh
-  #define MSL_USE_PRECOMPILED_HEADERS 0
-  #include <ansi_prefix.mac.h>
-  #ifndef __STDC__
-    #define __STDC__ 0
-  #endif
-
-  //  See list of #defines to configure the library in: 'MakeFile'
-  //  see also README
-
-  #define SILENT                // no collection messages. In case
-                                // of trouble you might want this off
-  #define ALL_INTERIOR_POINTERS // follows interior pointers.
-//#define DONT_ADD_BYTE_AT_END  // disables the padding if defined.
-//#define SMALL_CONFIG          // whether to use a smaller heap.
-  #define NO_SIGNALS            // signals aren't real on the Macintosh.
-  #define ATOMIC_UNCOLLECTABLE  // GC_malloc_atomic_uncollectable()
-
-  // define either or none as per personal preference
-  //   used in malloc.c
-  #define REDIRECT_MALLOC GC_malloc
-//#define REDIRECT_MALLOC GC_malloc_uncollectable
-  // if REDIRECT_MALLOC is #defined make sure that the GC library
-  // is listed before the ANSI/ISO libs in the Codewarrior
-  // 'Link order' panel
-//#define IGNORE_FREE
-
-  // mac specific configs
-//#define USE_TEMPORARY_MEMORY    // use Macintosh temporary memory.
-//#define SHARED_LIBRARY_BUILD    // build for use in a shared library.
-
-#else
-  // could build Win32 here too, or in the future
-  // Rhapsody PPC-mach, Rhapsody PPC-MacOS,
-  // Rhapsody Intel-mach, Rhapsody Intel-Win32,...
-  // ... ugh this will get messy ...
-#endif
-
-// make sure ints are at least 32-bit
-// ( could be set to 16-bit by compiler settings (68K) )
-
-struct gc_private_assert_intsize_{ char x[ sizeof(int)>=4 ? 1 : 0 ]; };
-
-#if __powerc
-  #if __option(toc_data)
-    #error turn off "store static data in TOC" when using GC
-    //     ... or find a way to add TOC to the root set...(?)
-  #endif
-#endif
----- ( cut here ) ----  end of gc_prefix_common.h  -----------------
-
-Files to  build the GC libraries:
---------------------------------
-    allchblk.c
-    alloc.c
-    blacklst.c
-    checksums.c
-    dbg_mlc.c
-    finalize.c
-    headers.c
-    mach_dep.c
-    MacOS.c    -- contains MacOS code
-    malloc.c
-    mallocx.c
-    mark.c
-    mark_rts.c
-    misc.c
-    new_hblk.c
-    obj_map.c
-    os_dep.c   -- contains MacOS code
-    ptr_chck.c
-    reclaim.c
-    stubborn.c
-    typd_mlc.c
-    gc++.cc    -- this is 'gc_cpp.cc' with less 'inline' and
-               -- throw std::bad_alloc when out of memory
-               -- gc_cpp.cc works just fine too
-
-2) Test that the library works with 'test.c'.
-=============================================
-
-The test app is just an ordinary ANSI-C console app. Make sure settings
-match the library you're testing.
-
-Files
------
-    test.c
-    the GC library to test        -- link order before ANSI libs
-    suitable Mac+ANSI libraries
-
-prefix:
-------
----- ( cut here ) ----  gc_prefix_testlib.h     -- all libs -----
-#define MSL_USE_PRECOMPILED_HEADERS 0
-#include <ansi_prefix.mac.h>
-#undef NDEBUG
-
-#define ALL_INTERIOR_POINTERS	/* for GC_priv.h */
----- ( cut here ) ----
-
-3) Test that the C++ interface 'gc_cpp.cc/h' works with 'test_cpp.cc'.
-
-The test app is just an ordinary ANSI-C console app. Make sure settings match
-the library you're testing.
-
-Files
------
-    test_cpp.cc
-    the GC library to test        -- link order before ANSI libs
-    suitable Mac+ANSI libraries
-
-prefix:
-------
-same as for test.c
-
-For convenience I used one test-project with several targets so that all
-test apps are build at once. Two for each library to test: test.c and
-gc_app.cc. When I was satisfied that the libraries were ok. I put the
-libraries + gc.h + the c++ interface-file in a folder that I then put into
-the MSL hierarchy so that I don't have to alter access-paths in projects
-that use the GC.
-
-After that, just add the proper GC library to your project and the GC is in
-action! malloc will call GC_malloc and free GC_free, new/delete too. You
-don't have to call free or delete. You may have to be a bit cautious about
-delete if you're freeing other resources than RAM. See gc_cpp.h. You can
-also keep coding as always with delete/free. That works too. If you want,
-"include <gc.h> and tweak it's use a bit.
-
-Symantec SPM
-============
-It has been a while since I tried the GC in SPM, but I think that the above
-instructions should be sufficient to guide you through in SPM too. SPM
-needs to know where the global data is. Use the files 'datastart.c' and
-'dataend.c'. Put 'datastart.c' at the top of your project and 'dataend.c'
-at the bottom  of your project so that all data is surrounded. This is not
-needed in Codewarrior because it provides intrinsic variables
-__datastart__, __data_end__ that wraps all globals.
-
-Source Changes (GC 4.12a2)
-==========================
-Very few. Just one tiny in the GC, not strictly needed.
-- MacOS.c line 131 in routine GC_MacFreeTemporaryMemory()
-  change #       if !defined(SHARED_LIBRARY_BUILD)
-  to     #       if !defined(SILENT) && !defined(SHARED_LIBRARY_BUILD)
-  To turn off a message when the application quits (actually, I faked
-  this change by #defining SHARED_LIBRARY_BUILD in a statically linked
-  library for more than a year without ill effects but perhaps this is
-  better).
-
-- test_cpp.cc
-  made the first lines of main() look like this:
-  ------------
-  int main( int argc, char* argv[] ) {
-  #endif
-  #if macintosh                             // MacOS
-    char* argv_[] = {"test_cpp","10"};      //   doesn't
-    argv=argv_;                             //     have a
-    argc = sizeof(argv_)/sizeof(argv_[0]);  //       commandline
-  #endif                                    //
-
-  int i, iters, n;
-  # ifndef __GNUC__
-   alloc dummy_to_fool_the_compiler_into_doing_things_it_currently_cant_handle;
-  ------------
-
-- config.h [now gcconfig.h]
-  __MWERKS__ does not have to mean MACOS. You can use Codewarrior to
-  build a Win32 or BeOS library and soon a Rhapsody library. You may
-  have to change that #if...
-
-
-
-   It worked for me, hope it works for you.
-
-   Lars Farm
-   18 July 1997
-----------------------------------------------------------------------------
-
-
-Patrick Beard's instructions (may be dated):
-
-v4.3 of the collector now runs under Symantec C++/THINK C v7.0.4, and
-Metrowerks C/C++ v4.5 both 68K and PowerPC. Project files are provided
-to build and test the collector under both development systems.
-
-Configuration
--------------
-
-To configure the collector, under both development systems, a prefix file
-is used to set preprocessor directives. This file is called "MacOS_config.h".
-Also to test the collector, "MacOS_Test_config.h" is provided.
-
-Testing
--------
-
-To test the collector (always a good idea), build one of the gctest projects,
-gctest.¹ (Symantec C++/THINK C), mw/gctest.68K.¹, or mw/gctest.PPC.¹. The
-test will ask you how many times to run; 1 should be sufficient.
-
-Building 
---------
-
-For your convenience project files for the major Macintosh development
-systems are provided.
-
-For Symantec C++/THINK C, you must build the two projects gclib-1.¹ and
-gclib-2.¹. It has to be split up because the collector has more than 32k
-of static data and no library can have more than this in the Symantec
-environment. (Future versions will probably fix this.)
-
-For Metrowerks C/C++ 4.5 you build gc.68K.¹/gc.PPC.¹ and the result will
-be a library called gc.68K.lib/gc.PPC.lib.
-
-Using
------
-
-Under Symantec C++/THINK C, you can just add the gclib-1.¹ and gclib-2.¹
-projects to your own project. Under Metrowerks, you add gc.68K.lib or
-gc.PPC.lib and two additional files. You add the files called datastart.c
-and dataend.c to your project, bracketing all files that use the collector.
-See mw/gctest.¹ for an example.
-
-Include the projects/libraries you built above into your own project,
-#include "gc.h", and call GC_malloc. You don't have to call GC_free.
-
-
-Patrick C. Beard
-January 4, 1995
diff --git a/boehm-gc/doc/README.MacOSX b/boehm-gc/doc/README.MacOSX
deleted file mode 100644
index f5333d51ad6..00000000000
--- a/boehm-gc/doc/README.MacOSX
+++ /dev/null
@@ -1 +0,0 @@
-See README.darwin for the latest Darwin/MacOSX information.
diff --git a/boehm-gc/doc/README.OS2 b/boehm-gc/doc/README.OS2
deleted file mode 100644
index 5345bbd0f65..00000000000
--- a/boehm-gc/doc/README.OS2
+++ /dev/null
@@ -1,6 +0,0 @@
-The code assumes static linking, and a single thread.  The editor de has
-not been ported.  The cord test program has.  The supplied OS2_MAKEFILE
-assumes the IBM C Set/2 environment, but the code shouldn't.
-
-Since we haven't figured out hoe to do perform partial links or to build static
-libraries, clients currently need to link against a long list of executables.
diff --git a/boehm-gc/doc/README.amiga b/boehm-gc/doc/README.amiga
deleted file mode 100644
index 730dce3fe96..00000000000
--- a/boehm-gc/doc/README.amiga
+++ /dev/null
@@ -1,322 +0,0 @@
-===========================================================================
-            Kjetil S. Matheussen's notes (28-11-2000)
-===========================================================================
-Compiles under SAS/C again. Should allso still compile under other
-amiga compilers without big changes. I haven't checked if it still
-works under gcc, because I don't have gcc for amiga. But I have
-updated 'Makefile', and hope it compiles fine.
-
-
-WHATS NEW:
-
-1.
-   Made a pretty big effort in preventing GCs allocating-functions from returning
-   chip-mem.
-
-   The lower part of the new file AmigaOS.c does this in various ways, mainly by
-   wrapping GC_malloc, GC_malloc_atomic, GC_malloc_uncollectable,
-   GC_malloc_atomic_uncollectable, GC_malloc_stubborn, GC_malloc_ignore_off_page
-   and GC_malloc_atomic_ignore_off_page. GC_realloc is allso wrapped, but
-   doesn't do the same effort in preventing to return chip-mem.
-   Other allocating-functions (f.ex. GC_*_typed_) can probably be
-   used without any problems, but beware that the warn hook will not be called.
-   In case of problems, don't define GC_AMIGA_FASTALLOC.
-
-   Programs using more time actually using the memory allocated
-   (instead of just allocate and free rapidly) have
-   the most to earn on this, but even gctest now normally runs twice
-   as fast and uses less memory, on my poor 8MB machine.
-
-   The changes have only effect when there is no more
-   fast-mem left. But with the way GC works, it
-   could happen quite often. Beware that an atexit handler had to be added,
-   so using the abort() function will make a big memory-loss.
-   If you absolutely must call abort() instead of exit(), try calling
-   the GC_amiga_free_all_mem function before abort().
-
-   New amiga-spesific compilation flags:
-
-   GC_AMIGA_FASTALLOC - By NOT defining this option, GC will work like before,
-                        it will not try to force fast-mem out of the OS, and
-                        it will use normal calloc for allocation, and the rest
-                        of the following flags will have no effect.
-
-   GC_AMIGA_ONLYFAST - Makes GC never to return chip-mem. GC_AMIGA_RETRY have
-                       no effect if this flag is set.
-
-   GC_AMIGA_GC - If gc returns NULL, do a GC_gcollect, and try again. This
-                 usually is a success with the standard GC configuration. 
-                 It is allso the most important flag to set to prevent
-                 GC from returning chip-mem. Beware that it slows down a lot
-                 when a program is rapidly allocating/deallocating when
-                 theres either very little fast-memory left or verly little
-                 chip-memory left. Its not a very common situation, but gctest
-                 sometimes (very rare) use many minutes because of this.
-
-   GC_AMIGA_RETRY - If gc succeed allocating memory, but it is chip-mem,
-                    try again and see if it is fast-mem. Most of the time,
-                    it will actually return fast-mem for the second try.
-                    I have set max number of retries to 9 or size/5000. You
-                    can change this if you like. (see GC_amiga_rec_alloc())
-
-   GC_AMIGA_PRINTSTATS - Gather some statistics during the execution of a
-                         program, and prints out the info when the atexit-handler
-                         is called.
-
-   My reccomendation is to set all this flags, except GC_AMIGA_PRINTSTATS and
-   GC_AMIGA_ONLYFAST.
-
-   If your program demands high response-time, you should
-   not define GC_AMIGA_GC, and possible allso define GC_AMIGA_ONLYFAST.
-   GC_AMIGA_RETRY does not seem to slow down much.
-
-   Allso, when compiling up programs, and GC_AMIGA_FASTALLOC was not defined when
-   compilling gc, you can define GC_AMIGA_MAKINGLIB to avoid having these allocation-
-   functions wrapped. (see gc.h)
-
-   Note that GC_realloc must not be called before any of
-   the other above mentioned allocating-functions have been called. (shouldn't be
-   any programs doing so either, I hope).
-
-   Another note. The allocation-function is wrapped when defining
-   GC_AMIGA_FASTALLOC by letting the function go thru the new
-   GC_amiga_allocwrapper_do function-pointer (see gc.h). Means that
-   sending function-pointers, such as GC_malloc, GC_malloc_atomic, etc.,
-   for later to be called like f.ex this, (*GC_malloc_functionpointer)(size),
-   will not wrap the function. This is normally not a big problem, unless
-   all allocation function is called like this, which will cause the
-   atexit un-allocating function never to be called. Then you either
-   have to manually add the atexit handler, or call the allocation-
-   functions function-pointer functions like this;
-   (*GC_amiga_allocwrapper_do)(size,GC_malloc_functionpointer).
-   There are probably better ways this problem could be handled, unfortunately,
-   I didn't find any without rewriting or replacing a lot of the GC-code, which
-   I really didn't want to. (Making new GC_malloc_* functions, and just
-   define f.ex GC_malloc as GC_amiga_malloc should allso work).
-
-
-   New amiga-spesific function:
-
-     void GC_amiga_set_toany(void (*func)(void));
-
-   'func' is a function that will be called right before gc has to change
-   allocation-method from MEMF_FAST to MEMF_ANY. Ie. when it is likely
-   it will return chip-mem.
-
-
-2. A few small compiler-spesific additions to make it compile with SAS/C again.
-
-3. Updated and rewritten the smakefile, so that it works again and that
-   the "unnecesarry" 'SCOPTIONS' files could be removed. Allso included
-   the cord-smakefile stuff in the main smakefile, so that the cord smakefile
-   could be removed too. By writing smake -f Smakefile.smk, both gc.lib and
-   cord.lib will be made.
-
-
-
-STILL MISSING:
-
-Programs can not be started from workbench, at least not for SAS/C. (Martin
-Tauchmanns note about that it now works with workbench is definitely wrong
-when concerning SAS/C). I guess it works if you use the old "#if 0'ed"-code,
-but I haven't tested it. I think the reason for MT to replace the
-"#if 0'ed"-code was only because it was a bit to SAS/C-spesific. But I
-don't know. An iconx-script solves this problem anyway.
-
-
-BEWARE!
-
--To run gctest, set the stack to around 200000 bytes first.
--SAS/C-spesific: cord will crash if you compile gc.lib with
- either parm=reg or parm=both. (missing legal prototypes for
- function-pointers someplace is the reason I guess.).
-
-
-tested with software: Radium, http://www.stud.ifi.uio.no/~ksvalast/radium/
-
-tested with hardware: MC68060
-
-
--ksvalast@ifi.uio.no
-
-
-===========================================================================
-			   Martin Tauchmann's notes		(1-Apr-99)
-===========================================================================
-
-Works now, also with the GNU-C compiler V2.7.2.1. <ftp://ftp.unina.it/pub/amiga/geekgadgets/amiga/m68k/snapshots/971125/amiga-bin/>
-Modify the `Makefile`
-CC=cc $(ABI_FLAG)
-to
-CC=gcc $(ABI_FLAG)
-
-TECHNICAL NOTES
-
-- `GC_get_stack_base()`, `GC_register_data_segments()` works now with every
-   C compiler; also Workbench.
-
-- Removed AMIGA_SKIP_SEG, but the Code-Segment must not be scanned by GC.
-
-
-PROBLEMS
-- When the Linker, does`t merge all Code-Segments to an single one. LD of GCC
-  do it always.
-
-- With ixemul.library V47.3, when an GC program launched from another program
-  (example: `Make` or `if_mach M68K AMIGA gctest`), `GC_register_data_segments()`
-  found the Segment-List of the caller program.
-  Can be fixed, if the run-time initialization code (for C programs, usually *crt0*)
-  support `__data` and `__bss`.
-
-- PowerPC Amiga currently not supported.
-
-- Dynamic libraries (dyn_load.c) not supported.
-
-
-TESTED WITH SOFTWARE
-
-`Optimized Oberon 2 C` (oo2c) <http://cognac.informatik.uni-kl.de/download/index.html>
-
-
-TESTED WITH HARDWARE
-
-MC68030
-
-
-CONTACT
-
-Please, contact me at <martintauchmann@bigfoot.com>, when you change the
-Amiga port. <http://martintauchmann.home.pages.de>
- 
-===========================================================================
-			   Michel Schinz's notes
-===========================================================================
-WHO DID WHAT
-
-The original Amiga port was made by Jesper Peterson. I (Michel Schinz)
-modified it slightly to reflect the changes made in the new official
-distributions, and to take advantage of the new SAS/C 6.x features. I also
-created a makefile to compile the "cord" package (see the cord
-subdirectory).
-
-TECHNICAL NOTES
-
-In addition to Jesper's notes, I have the following to say:
-
-- Starting with version 4.3, gctest checks to see if the code segment is
-  added to the root set or not, and complains if it is. Previous versions
-  of this Amiga port added the code segment to the root set, so I tried to
-  fix that. The only problem is that, as far as I know, it is impossible to
-  know which segments are code segments and which are data segments (there
-  are indeed solutions to this problem, like scanning the program on disk
-  or patch the LoadSeg functions, but they are rather complicated). The
-  solution I have chosen (see os_dep.c) is to test whether the program
-  counter is in the segment we are about to add to the root set, and if it
-  is, to skip the segment. The problems are that this solution is rather
-  awkward and that it works only for one code segment. This means that if
-  your program has more than one code segment, all of them but one will be
-  added to the root set. This isn't a big problem in fact, since the
-  collector will continue to work correctly, but it may be slower.
-
-  Anyway, the code which decides whether to skip a segment or not can be
-  removed simply by not defining AMIGA_SKIP_SEG. But notice that if you do
-  so, gctest will complain (it will say that "GC_is_visible produced wrong
-  failure indication"). However, it may be useful if you happen to have
-  pointers stored in a code segment (you really shouldn't).
-
-  If anyone has a good solution to the problem of finding, when a program
-  is loaded in memory, whether a segment is a code or a data segment,
-  please let me know.
-
-PROBLEMS
-
-If you have any problem with this version, please contact me at
-schinz@alphanet.ch (but do *not* send long files, since we pay for
-every mail!).
-
-===========================================================================
-			  Jesper Peterson's notes
-===========================================================================
-
-ADDITIONAL NOTES FOR AMIGA PORT
-
-These notes assume some familiarity with Amiga internals.
-
-WHY I PORTED TO THE AMIGA
-
-The sole reason why I made this port was as a first step in getting
-the Sather(*) language on the Amiga. A port of this language will
-be done as soon as the Sather 1.0 sources are made available to me.
-Given this motivation, the garbage collection (GC) port is rather
-minimal.
-
-(*) For information on Sather read the comp.lang.sather newsgroup.
-
-LIMITATIONS
-
-This port assumes that the startup code linked with target programs
-is that supplied with SAS/C versions 6.0 or later. This allows
-assumptions to be made about where to find the stack base pointer
-and data segments when programs are run from WorkBench, as opposed
-to running from the CLI. The compiler dependent code is all in the
-GC_get_stack_base() and GC_register_data_segments() functions, but
-may spread as I add Amiga specific features.
-
-Given that SAS/C was assumed, the port is set up to be built with
-"smake" using the "SMakefile". Compiler options in "SCoptions" can
-be set with "scopts" program. Both "smake" and "scopts" are part of
-the SAS/C commercial development system.
-
-In keeping with the porting philosophy outlined above, this port
-will not behave well with Amiga specific code. Especially not inter-
-process comms via messages, and setting up public structures like
-Intuition objects or anything else in the system lists. For the
-time being the use of this library is limited to single threaded
-ANSI/POSIX  compliant or near-complient code. (ie. Stick to stdio
-for now). Given this limitation there is currently no mechanism for
-allocating "CHIP" or "PUBLIC" memory under the garbage collector.
-I'll add this after giving it considerable thought. The major
-problem is the entire physical address space may have to me scanned,
-since there is no telling who we may have passed memory to.
-
-If you allocate your own stack in client code, you will have to
-assign the pointer plus stack size to GC_stackbottom.
-
-The initial stack size of the target program can be compiled in by
-setting the __stack symbol (see SAS documentaion). It can be over-
-ridden from the CLI by running the AmigaDOS "stack" program, or from
-the WorkBench by setting the stack size in the tool types window.
-
-SAS/C COMPILER OPTIONS (SCoptions)
-
-You may wish to check the "CPU" code option is appropriate for your
-intended target system.
-
-Under no circumstances set the "StackExtend" code option in either
-compiling the library or *ANY* client code.
-
-All benign compiler warnings have been suppressed. These mainly
-involve lack of prototypes in the code, and dead assignments
-detected by the optimizer.
-
-THE GOOD NEWS
-
-The library as it stands is compatible with the GigaMem commercial
-virtual memory software, and probably similar PD software.
-
-The performance of "gctest" on an Amiga 2630 (68030 @ 25Mhz)
-compares favourably with an HP9000 with similar architecture (a 325
-with a 68030 I think).
-
------------------------------------------------------------------------
-
-The Amiga port has been brought to you by:
-
-Jesper Peterson.
-
-jep@mtiame.mtia.oz.au		(preferred, but 1 week turnaround)
-jep@orca1.vic.design.telecom.au (that's orca<one>, 1 day turnaround)
-
-At least one of these addresses should be around for a while, even
-though I don't work for either of the companies involved.
-
diff --git a/boehm-gc/doc/README.arm.cross b/boehm-gc/doc/README.arm.cross
deleted file mode 100644
index 96744edaf67..00000000000
--- a/boehm-gc/doc/README.arm.cross
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Margaret Fleck
-
-Here's the key details of what worked for me, in case anyone else needs them.
-There may well be better ways to do some of this, but ....
-   -- Margaret
-
-
-The badge4 has a StrongArm-1110 processor and a StrongArm-1111 coprocessor.  
-
-Assume that the garbage collector distribution is unpacked into /home/arm/gc6.0,
-which is visible to both the ARM machine and a linux desktop (e.g. via NFS mounting).
-
-Assume that you have a file /home/arm/config.site with contents something like the
-example attached below.  Notice that our local ARM toolchain lives in
-/skiff/local.
-
-Go to /home/arm/gc6.0 directory.  Do
-  CONFIG_SITE=/home/arm/config.site ./configure --target=arm-linux
---prefix=/home/arm/gc6.0
-
-On your desktop, do:
-   make
-   make install
-The main garbage collector library should now be in ../gc6.0/lib/libgc.so.  
-
-To test the garbage collector, first do the following on your desktop
-   make gctest
-   ./gctest
-Then do the following on the ARM machine
-   cd .libs
-   ./lt-gctest
-
-Do not try to do "make test" (the usual way of running the test
-program).  This does not work and seems to erase some of the important
-files.
-
-The gctest program claims to have succeeded.  Haven't run any further tests
-with it, though I'll be doing so in the near future.
-
--------------------------------
-# config.site for configure
-
-# Modified from the one provided by Bradley D. LaRonde
-# Edited by Andrej Cedilnik <acedil1@csee.umbc.edu>
-# Used some of solutions by Tilman Vogel <Tilman.Vogel@web.de>
-# Ported for iPAQ Familiar by Oliver Kurth <oliver.kurth@innominate.com>
-# Further modified by Margaret Fleck for the badge4
-
-HOSTCC=gcc
-
-# Names of the cross-compilers
-CC=/skiff/local/bin/arm-linux-gcc
-CXX=/skiff/local/bin/arm-linux-gcc
-
-# The cross compiler specific options
-CFLAGS="-O2 -fno-exceptions"
-CXXFLAGS="-O2 -fno-exceptions"
-CPPFLAGS="-O2 -fno-exceptions"
-LDFLAGS=""
-
-# Some other programs
-AR=/skiff/local/bin/arm-linux-ar
-RANLIB=/skiff/local/bin/arm-linux-ranlib
-NM=/skiff/local/bin/arm-linux-nm
-ac_cv_path_NM=/skiff/local/bin/arm-linux-nm
-ac_cv_func_setpgrp_void=yes
-x_includes=/skiff/local/arm-linux/include/X11
-x_libraries=/skiff/local/arm-linux/lib/X11
diff --git a/boehm-gc/doc/README.autoconf b/boehm-gc/doc/README.autoconf
deleted file mode 100644
index 53fcf5a50b3..00000000000
--- a/boehm-gc/doc/README.autoconf
+++ /dev/null
@@ -1,59 +0,0 @@
-As of GC6.0alpha8, we attempt to support GNU-style builds based on automake,
-autoconf and libtool.  This is based almost entirely on Tom Tromey's work
-with gcj.
-
-To build and install libraries use
-
-configure; make; make install
-
-The advantages of this process are:
-
-1) It should eventually do a better job of automatically determining the
-right compiler to use, etc.  It probably already does in some cases.
-
-2) It tries to automatically set a good set of default GC parameters for
-the platform (e.g. thread support).  It provides an easier way to configure
-some of the others.
-
-3) It integrates better with other projects using a GNU-style build process.
-
-4) It builds both dynamic and static libraries.
-
-The known disadvantages are:
-
-1) The build scripts are much more complex and harder to debug (though largely
-standard).  I don't understand them all, and there's probably lots of redundant
-stuff.
-
-2) It probably doesn't work on all Un*x-like platforms yet.  It probably will
-never work on the rest.
-
-3) The scripts are not yet complete.  Some of the standard GNU targets don't
-yet work.  (Corrections/additions are very welcome.)
-
-The distribution should contain all files needed to run "configure" and "make",
-as well as the sources needed to regenerate the derived files.  (If I missed
-some, please let me know.)
-
-Note that the distribution comes with a "Makefile" which will be overwritten
-by "configure" with one that is not at all equiavelent to the original.  The
-distribution contains a copy of the original "Makefile" in "Makefile.direct". 
-
-Important options to configure:
-
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [/usr/local]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --enable-threads=TYPE   choose threading package
-  --enable-parallel-mark  parallelize marking and free list construction
-  --enable-full-debug	include full support for pointer backtracing etc.
-
-Unless --prefix is set (or --exec-prefix or one of the more obscure options),
-make install will install libgc.a and libgc.so in /usr/local/bin, which
-would typically require the "make install" to be run as root.
-
-Most commonly --enable-threads=posix or will be needed.  --enable-parallel-mark
-is recommended for multiprocessors if it is supported on the platform.
-
-
diff --git a/boehm-gc/doc/README.changes b/boehm-gc/doc/README.changes
deleted file mode 100644
index 97b0b684dde..00000000000
--- a/boehm-gc/doc/README.changes
+++ /dev/null
@@ -1,2278 +0,0 @@
-This is a rough history of garbage collector bugs and versions.
-
-This has been maintained with varying diligence over the years.
-
-I made an attempt to include recent contributors here.  I apologize for any
-omissions.
-
--------------------------
-
-  Version 1.3 and immediately preceding versions contained spurious
-assembly language assignments to TMP_SP.  Only the assignment in the PC/RT
-code is necessary.  On other machines, with certain compiler options,
-the assignments can lead to an unsaved register being overwritten.
-Known to cause problems under SunOS 3.5 WITHOUT the -O option.  (With
--O the compiler recognizes it as dead code.  It probably shouldn't,
-but that's another story.)
-
-  Version 1.4 and earlier versions used compile time determined values
-for the stack base.  This no longer works on Sun 3s, since Sun 3/80s use
-a different stack base.  We now use a straightforward heuristic on all
-machines on which it is known to work (incl. Sun 3s) and compile-time
-determined values for the rest.  There should really be library calls
-to determine such values.
-
-  Version 1.5 and earlier did not ensure 8 byte alignment for objects
-allocated on a sparc based machine.
-
-  Version 1.8 added ULTRIX support in gc_private.h.
-  
-  Version 1.9 fixed a major bug in gc_realloc.
-  
-  Version 2.0 introduced a consistent naming convention for collector
-routines and added support for registering dynamic library data segments
-in the standard mark_roots.c.  Most of the data structures were revamped.
-The treatment of interior pointers was completely changed.  Finalization
-was added.  Support for locking was added.  Object kinds were added.
-We added a black listing facility to avoid allocating at addresses known
-to occur as integers somewhere in the address space.  Much of this
-was accomplished by adapting ideas and code from the PCR collector.
-The test program was changed and expanded.
-
-  Version 2.1 was the first stable version since 1.9, and added support
-for PPCR.
-
-  Version 2.2 added debugging allocation, and fixed various bugs.  Among them:
-- GC_realloc could fail to extend the size of the object for certain large object sizes.
-- A blatant subscript range error in GC_printf, which unfortunately
-  wasn't exercised on machines with sufficient stack alignment constraints.
-- GC_register_displacement did the wrong thing if it was called after
-  any allocation had taken place.
-- The leak finding code would eventually break after 2048 byte
-  byte objects leaked.
-- interface.c didn't compile.
-- The heap size remained much too small for large stacks.
-- The stack clearing code behaved badly for large stacks, and perhaps
-  on HP/PA machines.
-
-  Version 2.3 added ALL_INTERIOR_POINTERS and fixed the following bugs:
-- Missing declaration of etext in the A/UX version.
-- Some PCR root-finding problems.
-- Blacklisting was not 100% effective, because the plausible future
-  heap bounds were being miscalculated.
-- GC_realloc didn't handle out-of-memory correctly.
-- GC_base could return a nonzero value for addresses inside free blocks.
-- test.c wasn't really thread safe, and could erroneously report failure
-  in a multithreaded environment.  (The locking primitives need to be
-  replaced for other threads packages.)
-- GC_CONS was thoroughly broken.
-- On a SPARC with dynamic linking, signals stayed diabled while the
-  client code was running.
-  (Thanks to Manuel Serrano at INRIA for reporting the last two.)
-  
-  Version 2.4 added GC_free_space_divisor as a tuning knob, added
-  support for OS/2 and linux, and fixed the following bugs:
-- On machines with unaligned pointers (e.g. Sun 3), every 128th word could
-  fail to be considered for marking.
-- Dynamic_load.c erroneously added 4 bytes to the length of the data and
-  bss sections of the dynamic library.  This could result in a bad memory
-  reference if the actual length was a multiple of a page.  (Observed on
-  Sun 3.  Can probably also happen on a Sun 4.)
-  (Thanks to Robert Brazile for pointing out that the Sun 3 version
-  was broken.  Dynamic library handling is still broken on Sun 3s
-  under 4.1.1U1, but apparently not 4.1.1.  If you have such a machine,
-  use -Bstatic.)
-  
-  Version 2.5 fixed the following bugs:
-- Removed an explicit call to exit(1)
-- Fixed calls to GC_printf and GC_err_printf, so the correct number of
-  arguments are always supplied.  The OS/2 C compiler gets confused if
-  the number of actuals and the number of formals differ.  (ANSI C
-  doesn't require this to work.  The ANSI sanctioned way of doing things
-  causes too many compatibility problems.)
-  
-  Version 3.0  added generational/incremental collection and stubborn
-  objects.
-
-  Version 3.1 added the following features:
-- A workaround for a SunOS 4.X SPARC C compiler
-  misfeature that caused problems when the collector was turned into
-  a dynamic library.  
-- A fix for a bug in GC_base that could result in a memory fault.
-- A fix for a performance bug (and several other misfeatures) pointed
-  out by Dave Detlefs and Al Dosser.
-- Use of dirty bit information for static data under Solaris 2.X.
-- DEC Alpha/OSF1 support (thanks to Al Dosser).
-- Incremental collection on more platforms.
-- A more refined heap expansion policy.  Less space usage by default.
-- Various minor enhancements to reduce space usage, and to reduce
-  the amount of memory scanned by the collector.
-- Uncollectable allocation without per object overhead.
-- More conscientious handling of out-of-memory conditions.
-- Fixed a bug in debugging stubborn allocation.
-- Fixed a bug that resulted in occasional erroneous reporting of smashed
-  objects with debugging allocation.
-- Fixed bogus leak reports of size 4096 blocks with FIND_LEAK.
-
-  Version 3.2 fixed a serious and not entirely repeatable bug in
-  the incremental collector.  It appeared only when dirty bit info
-  on the roots was available, which is normally only under Solaris.
-  It also added GC_general_register_disappearing_link, and some
-  testing code.  Interface.c disappeared.
-
-  Version 3.3 fixes several bugs and adds new ports:
-- PCR-specific bugs.
-- Missing locking in GC_free, redundant FASTUNLOCK
-  in GC_malloc_stubborn, and 2 bugs in
-  GC_unregister_disappearing_link.
-  All of the above were pointed out by Neil Sharman
-  (neil@cs.mu.oz.au).
-- Common symbols allocated by the SunOS4.X dynamic loader
-  were not included in the root set.
-- Bug in GC_finalize (reported by Brian Beuning and Al Dosser)
-- Merged Amiga port from Jesper Peterson (untested)
-- Merged NeXT port from Thomas Funke (significantly
-  modified and untested)
-
-  Version 3.4:
-- Fixed a performance bug in GC_realloc.
-- Updated the amiga port.
-- Added NetBSD and 386BSD ports.
-- Added cord library.
-- Added trivial performance enhancement for
-  ALL_INTERIOR_POINTERS.  (Don't scan last word.)
-  
-  Version 3.5
-- Minor collections now mark from roots only once, if that
-  doesn't cause an excessive pause.
-- The stack clearing heuristic was refined to prevent anomalies
-  with very heavily recursive programs and sparse stacks.
-- Fixed a bug that prevented mark stack growth in some cases.
-  GC_objects_are_marked should be set to TRUE after a call
-  to GC_push_roots and as part of GC_push_marked, since
-  both can now set mark bits.  I think this is only a performance
-  bug, but I wouldn't bet on it.  It's certainly very hard to argue
-  that the old version was correct.
-- Fixed an incremental collection bug that prevented it from
-  working at all when HBLKSIZE != getpagesize()
-- Changed dynamic_loading.c to include gc_priv.h before testing
-  DYNAMIC_LOADING.  SunOS dynamic library scanning
-  must have been broken in 3.4.
-- Object size rounding now adapts to program behavior.
-- Added a workaround (provided by Manuel Serrano and
-  colleagues) to a long-standing SunOS 4.X (and 3.X?) ld bug
-  that I had incorrectly assumed to have been squished.
-  The collector was broken if the text segment size was within
-  32 bytes of a multiple of 8K bytes, and if the beginning of
-  the data segment contained interesting roots.  The workaround
-  assumes a demand-loadable executable.  The original may have
-  have "worked" in some other cases.
-- Added dynamic library support under IRIX5.
-- Added support for EMX under OS/2 (thanks to Ari Huttunen).
-  
-Version 3.6:
-- fixed a bug in the mark stack growth code that was introduced
-  in 3.4.
-- fixed Makefile to work around DEC AXP compiler tail recursion
-  bug.
-
-Version 3.7:
-- Added a workaround for an HP/UX compiler bug.
-- Fixed another stack clearing performance bug.  Reworked
-  that code once more.
-  
-Version 4.0:
-- Added support for Solaris threads (which was possible
-  only by reimplementing some fraction of Solaris threads,
-  since Sun doesn't currently make the thread debugging
-  interface available).
-- Added non-threads win32 and win32S support.
-- (Grudgingly, with suitable muttering of obscenities) renamed
-  files so that the collector distribution could live on a FAT
-  file system.  Files that are guaranteed to be useless on
-  a PC still have long names.  Gc_inline.h and gc_private.h
-  still exist, but now just include  gc_inl.h and gc_priv.h.
-- Fixed a really obscure bug in finalization that could cause
-  undetected mark stack overflows.  (I would be surprised if
-  any real code ever tickled this one.)
-- Changed finalization code to dynamically resize the hash
-  tables it maintains.  (This probably does not matter for well-
-  -written code.  It no doubt does for C++ code that overuses
-  destructors.)
-- Added typed allocation primitives.  Rewrote the marker to
-  accommodate them with more reasonable efficiency.  This
-  change should also speed up marking for GC_malloc allocated
-  objects a little.  See gc_typed.h for new primitives.
-- Improved debugging facilities slightly.  Allocation time
-  stack traces are now kept by default on SPARC/SUNOS4.
-  (Thanks to Scott Schwartz.)
-- Added better support for small heap applications.
-- Significantly extended cord package.  Fixed a bug in the
-  implementation of lazily read files.  Printf and friends now
-  have cord variants.  Cord traversals are a bit faster.
-- Made ALL_INTERIOR_POINTERS recognition the default.
-- Fixed de so that it can run in constant space, independent
-  of file size.  Added simple string searching to cords and de.
-- Added the Hull-Ellis C++ interface.
-- Added dynamic library support for OSF/1.
-  (Thanks to Al Dosser and Tim Bingham at DEC.)
-- Changed argument to GC_expand_hp to be expressed
-  in units of bytes instead of heap blocks.  (Necessary
-  since the heap block size now varies depending on
-  configuration.  The old version was never very clean.)
-- Added GC_get_heap_size().  The previous "equivalent"
-  was broken.
-- Restructured the Makefile a bit.  
-
-Since version 4.0:
-- Changed finalization implementation to guarantee that
-  finalization procedures are called outside of the allocation
-  lock, making direct use of the interface a little less dangerous.
-  MAY BREAK EXISTING CLIENTS that assume finalizers
-  are protected by a lock.  Since there seem to be few multithreaded
-  clients that use finalization, this is hopefully not much of
-  a problem.
-- Fixed a gross bug in CORD_prev.
-- Fixed a bug in blacklst.c that could result in unbounded
-  heap growth during startup on machines that do not clear
-  memory obtained from the OS (e.g. win32S).
-- Ported de editor to win32/win32S.  (This is now the only
-  version with a mouse-sensitive UI.)
-- Added GC_malloc_ignore_off_page to allocate large arrays
-  in the presence of ALL_INTERIOR_POINTERS.
-- Changed GC_call_with_alloc_lock to not disable signals in
-  the single-threaded case.
-- Reduced retry count in GC_collect_or_expand for garbage
-  collecting when out of memory.
-- Made uncollectable allocations bypass black-listing, as they
-  should.
-- Fixed a bug in typed_test in test.c that could cause (legitimate)
-  GC crashes.
-- Fixed some potential synchronization problems in finalize.c
-- Fixed a real locking problem in typd_mlc.c.
-- Worked around an AIX 3.2 compiler feature that results in
-  out of bounds memory references.
-- Partially worked around an IRIX5.2 beta problem (which may
-  or may not persist to the final release).
-- Fixed a bug in the heap integrity checking code that could
-  result in explicitly deallocated objects being identified as
-  smashed.  Fixed a bug in the dbg_mlc stack saving code
-  that caused old argument pointers to be considered live.
-- Fixed a bug in CORD_ncmp (and hence CORD_str).
-- Repaired the OS2 port, which had suffered from bit rot
-  in 4.0.  Worked around what appears to be CSet/2 V1.0
-  optimizer bug.
-- Fixed a Makefile bug for target "c++".
-
-Since version 4.1:
-- Multiple bug fixes/workarounds in the Solaris threads version.
-  (It occasionally failed to locate some register contents for
-  marking.  It also turns out that thr_suspend and friends are
-  unreliable in Solaris 2.3.  Dirty bit reads appear
-  to be unreliable under some weird 
-  circumstances.  My stack marking code
-  contained a serious performance bug.  The new code is
-  extremely defensive, and has not failed in several cpu
-  hours of testing.  But  no guarantees ...)
-- Added MacOS support (thanks to Patrick Beard.)
-- Fixed several syntactic bugs in gc_c++.h and friends.  (These
-  didn't bother g++, but did bother most other compilers.)
-  Fixed gc_c++.h finalization interface.  (It didn't.)
-- 64 bit alignment for allocated objects was not guaranteed in a
-  few cases in which it should have been.
-- Added GC_malloc_atomic_ignore_off_page.
-- Added GC_collect_a_little.
-- Added some prototypes to gc.h.
-- Some other minor bug fixes (notably in Makefile).
-- Fixed OS/2 / EMX port (thanks to Ari Huttunen).
-- Fixed AmigaDOS port. (thanks to Michel Schinz).
-- Fixed the DATASTART definition under Solaris.  There
-  was a 1 in 16K chance of the collector missing the first
-  64K of static data (and thus crashing).
-- Fixed some blatant anachronisms in the README file.
-- Fixed PCR-Makefile for upcoming PPCR release.
-
-Since version 4.2:
-- Fixed SPARC alignment problem with GC_DEBUG.
-- Fixed Solaris threads /proc workaround.  The real
-  problem was an interaction with mprotect.
-- Incorporated fix from Patrick Beard for gc_c++.h (now gc_cpp.h).
-- Slightly improved allocator space utilization by
-  fixing the GC_size_map mechanism.
-- Integrated some Sony News and MIPS RISCos 4.51
-  patches.  (Thanks to Nobuyuki Hikichi of
-  Software Research Associates, Inc. Japan)
-- Fixed HP_PA alignment problem.  (Thanks to
-  xjam@cork.cs.berkeley.edu.)
-- Added GC_same_obj and friends.  Changed GC_base
-  to return 0 for pointers past the end of large objects.
-  Improved GC_base performance with ALL_INTERIOR_POINTERS
-  on machines with a slow integer mod operation.
-  Added GC_PTR_ADD, GC_PTR_STORE, etc. to prepare
-  for preprocessor.
-- changed the default on most UNIX machines to be that
-  signals are not disabled during critical GC operations.
-  This is still ANSI-conforming, though somewhat dangerous
-  in the presence of signal handlers. But the performance
-  cost of the alternative is sometimes problematic.
-  Can be changed back with a minor Makefile edit.
-- renamed IS_STRING in gc.h, to CORD_IS_STRING, thus
-  following my own naming convention.  Added the function
-  CORD_to_const_char_star.
-- Fixed a gross bug in GC_finalize.  Symptom: occasional
-  address faults in that function.  (Thanks to Anselm
-  Baird-Smith (Anselm.BairdSmith@inria.fr)
-- Added port to ICL DRS6000 running DRS/NX.  Restructured
-  things a bit to factor out common code, and remove obsolete
-  code.  Collector should now run under SUNOS5 with either
-  mprotect or /proc dirty bits.  (Thanks to Douglas Steel
-  (doug@wg.icl.co.uk)).
-- More bug fixes and workarounds for Solaris 2.X.  (These were
-  mostly related to putting the collector in a dynamic library,
-  which didn't really work before.  Also SOLARIS_THREADS
-  didn't interact well with dl_open.)  Thanks to btlewis@eng.sun.com.
-- Fixed a serious performance bug on the DEC Alpha.  The text
-  segment was getting registered as part of the root set.
-  (Amazingly, the result was still fast enough that the bug
-  was not conspicuous.) The fix works on OSF/1, version 1.3.
-  Hopefully it also works on other versions of OSF/1 ...
-- Fixed a bug in GC_clear_roots.
-- Fixed a bug in GC_generic_malloc_words_small that broke
-  gc_inl.h.  (Reported by Antoine de Maricourt.  I broke it
-  in trying to tweak the Mac port.) 
-- Fixed some problems with cord/de under Linux.
-- Fixed some cord problems, notably with CORD_riter4.
-- Added DG/UX port.
-  Thanks to Ben A. Mesander (ben@piglet.cr.usgs.gov)
-- Added finalization registration routines with weaker ordering
-  constraints.  (This is necessary for C++ finalization with
-  multiple inheritance, since the compiler often adds self-cycles.)
-- Filled the holes in the SCO port. (Thanks to Michael Arnoldus
-  <chime@proinf.dk>.)
-- John Ellis' additions to the C++ support:  From John:
-
-* I completely rewrote the documentation in the interface gc_c++.h
-(later renamed gc_cpp.h).  I've tried to make it both clearer and more
-precise.
-
-* The definition of accessibility now ignores pointers from an
-finalizable object (an object with a clean-up function) to itself.
-This allows objects with virtual base classes to be finalizable by the
-collector.  Compilers typically implement virtual base classes using
-pointers from an object to itself, which under the old definition of
-accessibility prevented objects with virtual base classes from ever
-being collected or finalized.
-
-* gc_cleanup now includes gc as a virtual base.  This was enabled by
-the change in the definition of accessibility.
-
-* I added support for operator new[].  Since most (all?) compilers
-don't yet support operator new[], it is conditionalized on
--DOPERATOR_NEW_ARRAY.  The code is untested, but its trivial and looks
-correct.
-
-* The test program test_gc_c++ (later renamed test_cpp.cc)
-tries to test for the C++-specific functionality not tested by the
-other programs.
-- Added <unistd.h> include to misc.c.  (Needed for ppcr.)
-- Added PowerMac port. (Thanks to Patrick Beard again.)
-- Fixed "srcdir"-related Makefile problems.  Changed things so
-  that all externally visible include files always appear in the
-  include subdirectory of the source.  Made gc.h directly
-  includable from C++ code.  (These were at Per
-  Bothner's suggestion.)
-- Changed Intel code to also mark from ebp (Kevin Warne's
-  suggestion).
-- Renamed C++ related files so they could live in a FAT
-  file system. (Charles Fiterman's suggestion.)
-- Changed Windows NT Makefile to include C++ support in
-  gc.lib.  Added C++ test as Makefile target.
-  
-Since version 4.3:
- - ASM_CLEAR_CODE was erroneously defined for HP
-   PA machines, resulting in a compile error.
- - Fixed OS/2 Makefile to create a library.  (Thanks to
-   Mark Boulter (mboulter@vnet.ibm.com)).
- - Gc_cleanup objects didn't work if they were created on
-   the stack.  Fixed.
- - One copy of Gc_cpp.h in the distribution was out of 
-   synch, and failed to document some known compiler
-   problems with explicit destructor invocation.  Partially
-   fixed.  There are probably other compilers on which
-   gc_cleanup is miscompiled.
- - Fixed Makefile to pass C compiler flags to C++ compiler.
- - Added Mac fixes.
- - Fixed os_dep.c to work around what appears to be
-   a new and different VirtualQuery bug under newer
-   versions of win32S.
- - GC_non_gc_bytes was not correctly maintained by
-   GC_free.  Fixed.  Thanks to James Clark (jjc@jclark.com).
- - Added GC_set_max_heap_size.
- - Changed allocation code to ignore blacklisting if it is preventing
-   use of a very large block of memory.  This has the advantage
-   that naive code allocating very large objects is much more
-   likely to work.  The downside is you might no
-   longer find out that such code should really use
-   GC_malloc_ignore_off_page.
- - Changed GC_printf under win32 to close and reopen the file
-   between calls.  FAT file systems otherwise make the log file
-   useless for debugging.
- - Added GC_try_to_collect and GC_get_bytes_since_gc.  These
-   allow starting an abortable collection during idle times. 
-   This facility does not require special OS support.  (Thanks to
-   Michael Spertus of Geodesic Systems for suggesting this.  It was
-   actually an easy addition.  Kumar Srikantan previously added a similar
-   facility to a now ancient version of the collector.  At the time
-   this was much harder, and the result was less convincing.)
- - Added some support for the Borland development environment.  (Thanks
-   to John Ellis and Michael Spertus.)
- - Removed a misfeature from checksums.c that caused unexpected 
-   heap growth.  (Thanks to Scott Schwartz.)
- - Changed finalize.c to call WARN if it encounters a finalization cycle.
-   WARN is defined in gc_priv.h to write a message, usually to stdout.
-   In many environments, this may be inappropriate.
- - Renamed NO_PARAMS in gc.h to GC_NO_PARAMS, thus adhering to my own
-   naming convention.
- - Added GC_set_warn_proc to intercept warnings.
- - Fixed Amiga port. (Thanks to Michel Schinz (schinz@alphanet.ch).)
- - Fixed a bug in mark.c that could result in an access to unmapped
-   memory from GC_mark_from_mark_stack on machines with unaligned
-   pointers.
- - Fixed a win32 specific performance bug that could result in scanning of
-   objects allocated with the system malloc.
- - Added REDIRECT_MALLOC.
-
-Since version 4.4:
- - Fixed many minor and one major README bugs. (Thanks to Franklin Chen
-   (chen@adi.com) for pointing out many of them.)
- - Fixed ALPHA/OSF/1 dynamic library support. (Thanks to Jonathan Bachrach
-   (jonathan@harlequin.com)).
- - Added incremental GC support (MPROTECT_VDB) for Linux (with some
-   help from Bruno Haible).
- - Altered SPARC recognition tests in gc.h and config.h (mostly as
-   suggested by Fergus Henderson).
- - Added basic incremental GC support for win32, as implemented by
-   Windows NT and Windows 95.  GC_enable_incremental is a noop
-   under win32s, which doesn't implement enough of the VM interface.
- - Added -DLARGE_CONFIG.
- - Fixed GC_..._ignore_off_page to also function without
-   -DALL_INTERIOR_POINTERS.
- - (Hopefully) fixed RS/6000 port.  (Only the test was broken.)
- - Fixed a performance bug in the nonincremental collector running
-   on machines supporting incremental collection with MPROTECT_VDB
-   (e.g. SunOS 4, DEC AXP).  This turned into a correctness bug under
-   win32s with win32 incremental collection.  (Not all memory protection
-   was disabled.)
- - Fixed some ppcr related bit rot.
- - Caused dynamic libraries to be unregistered before reregistering.
-   The old way turned out to be a performance bug on some machines.
- - GC_root_size was not properly maintained under MSWIN32.
- - Added -DNO_DEBUGGING and GC_dump.
- - Fixed a couple of bugs arising with SOLARIS_THREADS +
-   REDIRECT_MALLOC.
- - Added NetBSD/M68K port.  (Thanks to Peter Seebach
-   <seebs@taniemarie.solon.com>.)
- - Fixed a serious realloc bug.  For certain object sizes, the collector
-   wouldn't scan the expanded part of the object.  (Thanks to Clay Spence
-   (cds@peanut.sarnoff.com) for noticing the problem, and helping me to
-   track it down.)
-   
-Since version 4.5:
- - Added Linux ELF support.  (Thanks to Arrigo Triulzi <arrigo@ic.ac.uk>.)
- - GC_base crashed if it was called before any other GC_ routines.
-   This could happen if a gc_cleanup object was allocated outside the heap
-   before any heap allocation.
- - The heap expansion heuristic was not stable if all objects had finalization
-   enabled.  Fixed finalize.c to count memory in finalization queue and
-   avoid explicit deallocation.  Changed alloc.c to also consider this count.
-   (This is still not recommended.  It's expensive if nothing else.)  Thanks
-   to John Ellis for pointing this out.
- - GC_malloc_uncollectable(0) was broken.  Thanks to Phong Vo for pointing
-   this out.
- - The collector didn't compile under Linux 1.3.X.  (Thanks to Fred Gilham for
-   pointing this out.)  The current workaround is ugly, but expected to be
-   temporary.
- - Fixed a formatting problem for SPARC stack traces.
- - Fixed some '=='s in os_dep.c that should have been assignments.
-   Fortunately these were in code that should never be executed anyway.
-   (Thanks to Fergus Henderson.)
- - Fixed the heap block allocator to only drop blacklisted blocks in small
-   chunks.  Made BL_LIMIT self adjusting.  (Both of these were in response
-   to heap growth observed by Paul Graham.)
- - Fixed the Metrowerks/68K Mac code to also mark from a6.  (Thanks
-   to Patrick Beard.)
- - Significantly updated README.debugging.
- - Fixed some problems with longjmps out of signal handlers, especially under
-   Solaris.  Added a workaround for the fact that siglongjmp doesn't appear to
-   do the right thing with -lthread under Solaris.
- - Added MSDOS/djgpp port.  (Thanks to Mitch Harris  (maharri@uiuc.edu).)
- - Added "make reserved_namespace" and "make user_namespace".  The
-   first renames ALL "GC_xxx" identifiers as "_GC_xxx".  The second is the
-   inverse transformation.  Note that doing this is guaranteed to break all
-   clients written for the other names.
- - descriptor field for kind NORMAL in GC_obj_kinds with ADD_BYTE_AT_END
-   defined should be -ALIGNMENT not WORDS_TO_BYTES(-1).  This is
-   a serious bug on machines with pointer alignment of less than a word.
- - GC_ignore_self_finalize_mark_proc didn't handle pointers to very near the
-   end of the object correctly.  Caused failures of the C++ test on a DEC Alpha
-   with g++.
- - gc_inl.h still had problems.  Partially fixed.  Added warnings at the
-   beginning to hopefully specify the remaining dangers.
- - Added DATAEND definition to config.h.
- - Fixed some of the .h file organization.  Fixed "make floppy".
- 
-Since version 4.6:
- - Fixed some compilation problems with -DCHECKSUMS (thanks to Ian Searle)
- - Updated some Mac specific files to synchronize with Patrick Beard.
- - Fixed a serious bug for machines with non-word-aligned pointers.
-   (Thanks to Patrick Beard for pointing out the problem.  The collector
-   should fail almost any conceivable test immediately on such machines.)
-
-Since version 4.7:
- - Changed a "comment" in a MacOS specific part of mach-dep.c that caused
-   gcc to fail on other platforms.
-
-Since version 4.8
- - More README.debugging fixes.
- - Objects ready for finalization, but not finalized in the same GC
-   cycle, could be prematurely collected.  This occasionally happened
-   in test_cpp.
- - Too little memory was obtained from the system for very large
-   objects.  That could cause a heap explosion if these objects were
-   not contiguous (e.g. under PCR), and too much of them was blacklisted.
- - Due to an improper initialization, the collector was too hesitant to
-   allocate blacklisted objects immediately after system startup.
- - Moved GC_arrays from the data into the bss segment by not explicitly
-   initializing it to zero.  This significantly
-   reduces the size of executables, and probably avoids some disk accesses
-   on program startup.  It's conceivable that it might break a port that I
-   didn't test.
- - Fixed EMX_MAKEFILE to reflect the gc_c++.h to gc_cpp.h renaming which
-   occurred a while ago.
-
-Since 4.9:
- - Fixed a typo around a call to GC_collect_or_expand in alloc.c.  It broke
-   handling of out of memory.  (Thanks to Patrick Beard for noticing.)
-
-Since 4.10:
- - Rationalized (hopefully) GC_try_to_collect in an incremental collection
-   environment.  It appeared to not handle a call while a collection was in
-   progress, and was otherwise too conservative.
- - Merged GC_reclaim_or_delete_all into GC_reclaim_all to get rid of some
-   code.
- - Added Patrick Beard's Mac fixes, with substantial completely untested
-   modifications.
- - Fixed the MPROTECT_VDB code to deal with large pages and imprecise
-   fault addresses (as on an UltraSPARC running Solaris 2.5).  Note that this
-   was not a problem in the default configuration, which uses PROC_VDB.
- - The DEC Alpha assembly code needed to restore $gp between calls.
-   Thanks to Fergus Henderson for tracking this down and supplying a
-   patch.
- - The write command for "de" was completely broken for large files.
-   I used the easiest portable fix, which involved changing the semantics
-   so that f.new is written instead of overwriting f.  That's safer anyway.
- - Added README.solaris2 with a discussion of the possible problems of
-   mixing the collector's sbrk allocation with malloc/realloc.
- - Changed the data segment starting address for SGI machines.  The
-   old code failed under IRIX6.
- - Required double word alignment for MIPS.
- - Various minor fixes to remove warnings.
- - Attempted to fix some Solaris threads problems reported by Zhiying Chen.
-   In particular, the collector could try to fork a thread with the
-   world stopped as part of GC_thr_init.  It also failed to deal with
-   the case in which the original thread terminated before the whole
-   process did.
- - Added -DNO_EXECUTE_PERMISSION.  This has a major performance impact
-   on the incremental collector under Irix, and perhaps under other
-   operating systems.
- - Added some code to support allocating the heap with mmap.  This may
-   be preferable under some circumstances.
- - Integrated dynamic library support for HP.
-   (Thanks to Knut Tvedten <knuttv@ifi.uio.no>.)
- - Integrated James Clark's win32 threads support, and made a number
-   of changes to it, many of which were suggested by Pontus Rydin.
-   This is still not 100% solid.
- - Integrated Alistair Crooks' support for UTS4 running on an Amdahl
-   370-class machine.
- - Fixed a serious bug in explicitly typed allocation.  Objects requiring
-   large descriptors where handled in a way that usually resulted in
-   a segmentation fault in the marker.  (Thanks to Jeremy Fitzhardinge
-   for helping to track this down.)
- - Added partial support for GNU win32 development.  (Thanks to Fergus
-   Henderson.)
- - Added optional support for Java-style finalization semantics.  (Thanks
-   to Patrick Bridges.)  This is recommended only for Java implementations.
- - GC_malloc_uncollectable faulted instead of returning 0 when out of
-   memory.  (Thanks to dan@math.uiuc.edu for noticing.)
- - Calls to GC_base before the collector was initialized failed on a
-   DEC Alpha.  (Thanks to Matthew Flatt.)
- - Added base pointer checking to GC_REGISTER_FINALIZER in debugging
-   mode, at the suggestion of Jeremy Fitzhardinge.
- - GC_debug_realloc failed for uncollectable objects.  (Thanks to
-   Jeremy Fitzhardinge.)
- - Explicitly typed allocation could crash if it ran out of memory.
-   (Thanks to Jeremy Fitzhardinge.)
- - Added minimal support for a DEC Alpha running Linux.
- - Fixed a problem with allocation of objects whose size overflowed
-   ptrdiff_t.  (This now fails unconditionally, as it should.)
- - Added the beginning of Irix pthread support.
- - Integrated Xiaokun Zhu's fixes for djgpp 2.01.
- - Added SGI-style STL allocator support (gc_alloc.h).
- - Fixed a serious bug in README.solaris2.  Multithreaded programs must include
-   gc.h with SOLARIS_THREADS defined.
- - Changed GC_free so it actually deallocates uncollectable objects.
-   (Thanks to Peter Chubb for pointing out the problem.)
- - Added Linux ELF support for dynamic libararies.  (Thanks again to
-   Patrick Bridges.)
- - Changed the Borland cc configuration so that the assembler is not
-   required.
- - Fixed a bug in the C++ test that caused it to fail in 64-bit
-   environments.
-
-Since 4.11:
- - Fixed ElfW definition in dyn_load.c. (Thanks to Fergus Henderson.)
-   This prevented the dynamic library support from compiling on some
-   older ELF Linux systems.
- - Fixed UTS4 port (which I apparently mangled during the integration)
-   (Thanks to again to Alistair Crooks.)
- - "Make C++" failed on Suns with SC4.0, due to a problem with "bool".
-   Fixed in gc_priv.h.
- - Added more pieces for GNU win32.  (Thanks to Timothy N. Newsham.)
-   The current state of things should suffice for at least some
-   applications.
- - Changed the out of memory retry count handling as suggested by
-   Kenjiro Taura.  (This matters only if GC_max_retries > 0, which
-   is no longer the default.)
- - If a /proc read failed repeatedly, GC_written_pages was not updated
-   correctly.  (Thanks to Peter Chubb for diagnosing this.)
- - Under unlikely circumstances, the allocator could infinite loop in
-   an out of memory situation.  (Thanks again to Kenjiro Taura for
-   identifying the problem and supplying a fix.)
- - Fixed a syntactic error in the DJGPP code.  (Thanks to Fergus
-   Henderson for finding this by inspection.)  Also fixed a test program
-   problem with DJGPP (Thanks to Peter Monks.)
- - Atomic uncollectable objects were not treated correctly by the
-   incremental collector.  This resulted in weird log statistics and
-   occasional performance problems.  (Thanks to Peter Chubb for pointing
-   this out.)
- - Fixed some problems resulting from compilers that dont define
-   __STDC__.  In this case void * and char * were used inconsistently
-   in some cases.  (Void * should not have been used at all.  If
-   you have an ANSI superset compiler that does not define __STDC__,
-   please compile with -D__STDC__=0. Thanks to Manuel Serrano and others
-   for pointing out the problem.)
- - Fixed a compilation problem on Irix with -n32 and -DIRIX_THREADS.
-   Also fixed some other IRIX_THREADS problems which may or may not have
-   had observable symptoms.
- - Fixed an HP PA compilation problem in dyn_load.c.  (Thanks to
-   Philippe Queinnec.)
- - SEGV fault handlers sometimes did not get reset correctly.  (Thanks
-   to David Pickens.)
- - Added a fix for SOLARIS_THREADS on Intel.  (Thanks again to David
-   Pickens.)  This probably needs more work to become functional.
- - Fixed struct sigcontext_struct in os_dep.c for compilation under
-   Linux 2.1.X.	(Thanks to Fergus Henderson.)
- - Changed the DJGPP STACKBOTTOM and DATASTART values to those suggested
-   by Kristian Kristensen.  These may still not be right, but it is
-   it is likely to work more often than what was there before.  They may
-   even be exactly right.
- - Added a #include <string.h> to test_cpp.cc.  This appears to help
-   with HP/UX and gcc.  (Thanks to assar@sics.se.)
- - Version 4.11 failed to run in incremental mode on recent 64-bit Irix
-   kernels.  This was a problem related to page unaligned heap segments.
-   Changed the code to page align heap sections on all platforms.
-   (I had mistakenly identified this as a kernel problem earlier.
-   It was not.)
- - Version 4.11 did not make allocated storage executable, except on
-   one or two platforms, due to a bug in a #if test.  (Thanks to Dave
-   Grove for pointing this out.)
- - Added sparc_sunos4_mach_dep.s to support Sun's compilers under SunOS4.
- - Added GC_exclude_static_roots.
- - Fixed the object size mapping algorithm.  This shouldn't matter,
-   but the old code was ugly.
- - Heap checking code could die if one of the allocated objects was
-   larger than its base address.  (Unsigned underflow problem.  Thanks
-   to Clay Spence for isolating the problem.)
- - Added RS6000 (AIX) dynamic library support and fixed STACK_BOTTOM.
-   (Thanks to Fred Stearns.)
- - Added Fergus Henderson's patches for improved robustness with large
-   heaps and lots of blacklisting.
- - Added Peter Chubb's changes to support Solaris Pthreads, to support
-   MMAP allocation in Solaris, to allow Solaris to find dynamic libraries
-   through /proc, to add malloc_typed_ignore_off_page, and a few other
-   minor features and bug fixes.
- - The Solaris 2 port should not use sbrk.  I received confirmation from
-   Sun that the use of sbrk and malloc in the same program is not
-   supported.  The collector now defines USE_MMAP by default on Solaris.
- - Replaced the djgpp makefile with Gary Leavens' version.
- - Fixed MSWIN32 detection test.
- - Added Fergus Henderson's patches to allow putting the collector into
-   a DLL under GNU win32.
- - Added Ivan V. Demakov's port to Watcom C on X86.
- - Added Ian Piumarta's Linux/PowerPC port.
- - On Brian Burton's suggestion added PointerFreeGC to the placement
-   options in gc_cpp.h.  This is of course unsafe, and may be controversial.
-   On the other hand, it seems to be needed often enough that it's worth
-   adding as a standard facility.
-
-Since 4.12:
- - Fixed a crucial bug in the Watcom port.  There was a redundant decl
-   of GC_push_one in gc_priv.h.
- - Added FINALIZE_ON_DEMAND.
- - Fixed some pre-ANSI cc problems in test.c.
- - Removed getpagesize() use for Solaris.  It seems to be missing in one
-   or two versions.
- - Fixed bool handling for SPARCCompiler version 4.2.
- - Fixed some files in include that had gotten unlinked from the main
-   copy.
- - Some RS/6000 fixes (missing casts).  Thanks to Toralf Foerster.
- - Fixed several problems in GC_debug_realloc, affecting mostly the
-   FIND_LEAK case.
- - GC_exclude_static_roots contained a buggy unsigned comparison to
-   terminate a loop.  (Thanks to Wilson Ho.)
- - CORD_str failed if the substring occurred at the last possible position.
-   (Only affects cord users.)
- - Fixed Linux code to deal with RedHat 5.0 and integrated Peter Bigot's
-   os_dep.c code for dealing with various Linux versions.
- - Added workaround for Irix pthreads sigaction bug and possible signal
-   misdirection problems.
-Since alpha1:
- - Changed RS6000 STACKBOTTOM.
- - Integrated Patrick Beard's Mac changes.
- - Alpha1 didn't compile on Irix m.n, m < 6.
- - Replaced Makefile.dj with a new one from Gary Leavens.
- - Added Andrew Stitcher's changes to support SCO OpenServer.
- - Added PRINT_BLACK_LIST, to allow debugging of high densities of false
-   pointers.
- - Added code to debug allocator to keep track of return address
-   in GC_malloc caller, thus giving a bit more context.
- - Changed default behavior of large block allocator to more
-   aggressively avoid fragmentation.  This is likely to slow down the
-   collector when it succeeds at reducing space cost.
- - Integrated Fergus Henderson's CYGWIN32 changes.  They are untested,
-   but needed for newer versions.
- - USE_MMAP had some serious bugs.  This caused the collector to fail
-   consistently on Solaris with -DSMALL_CONFIG.
- - Added Linux threads support, thanks largely to Fergus Henderson.
-Since alpha2:
- - Fixed more Linux threads problems.
- - Changed default GC_free_space_divisor to 3 with new large block allocation.
-   (Thanks to Matthew Flatt for some measurements that suggest the old
-   value sometimes favors space too much over time.)
- - More CYGWIN32 fixes.
- - Integrated Tyson-Dowd's Linux-M68K port.
- - Minor HP PA and DEC UNIX fixes from Fergus Henderson.
- - Integrated Christoffe Raffali's Linux-SPARC changes.
- - Allowed for one more GC fixup iteration after a full GC in incremental
-   mode.  Some quick measurements suggested that this significantly
-   reduces pause times even with smaller GC_RATE values.
- - Moved some more GC data structures into GC_arrays.  This decreases
-   pause times and GC overhead, but makes debugging slightly less convenient.
- - Fixed namespace pollution problem ("excl_table").
- - Made GC_incremental a constant for -DSMALL_CONFIG, hopefully shrinking
-   that slightly.
- - Added some win32 threads fixes.
- - Integrated Ivan Demakov and David Stes' Watcom fixes.
- - Various other minor fixes contributed by many people.
- - Renamed config.h to gcconfig.h, since config.h tends to be used for
-   many other things.
- - Integrated Matthew Flatt's support for 68K MacOS "far globals".
- - Fixed up some of the dynamic library Makefile targets for consistency
-   across platforms.
- - Fixed a USE_MMAP typo that caused out-of-memory handling to fail
-   on Solaris.
- - Added code to test.c to test thread creation a bit more.
- - Integrated GC_win32_free_heap, as suggested by Ivan Demakov.
- - Fixed Solaris 2.7 stack base finding problem.  (This may actually
-   have been done in an earlier alpha release.)
-Since alpha3:
- - Fixed MSWIN32 recognition test, which interfered with cygwin.
- - Removed unnecessary gc_watcom.asm from distribution.  Removed
-   some obsolete README.win32 text.
- - Added Alpha Linux incremental GC support.  (Thanks to Philipp Tomsich
-   for code for retrieving the fault address in a signal handler.)
-   Changed Linux signal handler context argument to be a pointer.
- - Took care of some new warnings generated by the 7.3 SGI compiler.
- - Integrated Phillip Musumeci's FreeBSD/ELF fixes.
- - -DIRIX_THREADS was broken with the -o32 ABI (typo in gc_priv.h>
-
-Since 4.13:
- - Fixed GC_print_source_ptr to not use a prototype.
- - generalized CYGWIN test.
- - gc::new did the wrong thing with PointerFreeGC placement.
-   (Thanks to Rauli Ruohonen.)
- - In the ALL_INTERIOR_POINTERS (default) case, some callee-save register
-   values could fail to be scanned if the register was saved and
-   reused in a GC frame.  This showed up in verbose mode with gctest
-   compiled with an unreleased SGI compiler.  I vaguely recall an old
-   bug report that may have been related.  The bug was probably quite old.
-   (The problem was that the stack scanning could be deferred until
-   after the relevant frame was overwritten, and the new save location
-   might be outside the scanned area.  Fixed by more eager stack scanning.)
- - PRINT_BLACK_LIST had some problems.  A few source addresses were garbage.
- - Replaced Makefile.dj and added -I flags to cord make targets.
-   (Thanks to Gary Leavens.)
- - GC_try_to_collect was broken with the nonincremental collector.
- - gc_cleanup destructors could pass the wrong address to
-   GC_register_finalizer_ignore_self in the presence of multiple
-   inheritance.  (Thanks to Darrell Schiebel.)
- - Changed PowerPC Linux stack finding code.
-
-Since 4.14alpha1
- - -DSMALL_CONFIG did not work reliably with large (> 4K) pages.
-   Recycling the mark stack during expansion could result in a size
-   zero heap segment, which confused things.  (This was probably also an
-   issue with the normal config and huge pages.)
- - Did more work to make sure that callee-save registers were scanned
-   completely, even with the setjmp-based code.  Added USE_GENERIC_PUSH_REGS
-   macro to facilitate testing on machines I have access to.
- - Added code to explicitly push register contents for win32 threads.
-   This seems to be necessary.  (Thanks to Pierre de Rop.)
-
-Since 4.14alpha2
- - changed STACKBOTTOM for DJGPP (Thanks to Salvador Eduardo Tropea).
- 
-Since 4.14
- - Reworked large block allocator.  Now uses multiple doubly linked free
-   lists to approximate best fit.
- - Changed heap expansion heuristic.  Entirely free blocks are no longer
-   counted towards the heap size.  This seems to have a major impact on
-   heap size stability; the old version could expand the heap way too
-   much in the presence of large block fragmentation.
- - added -DGC_ASSERTIONS and some simple assertions inside the collector.
-   This is mainlyt for collector debugging.
- - added -DUSE_MUNMAP to allow the heap to shrink.  Suupported on only
-   a few UNIX-like platforms for now.
- - added GC_dump_regions() for debugging of fragmentation issues.
- - Changed PowerPC pointer alignment under Linux to 4.  (This needs
-   checking by someone who has one.  The suggestions came to me via a
-   rather circuitous path.)
- - Changed the Linux/Alpha port to walk the data segment backwards until
-   it encounters a SIGSEGV.  The old way to find the start of the data
-   segment broke with a recent release.
- - cordxtra.c needed to call GC_REGISTER_FINALIZER instead of
-   GC_register_finalizer, so that it would continue to work with GC_DEBUG.
- - allochblk sometimes cleared the wrong block for debugging purposes
-   when it dropped blacklisted blocks.  This could result in spurious
-   error reports with GC_DEBUG.
- - added MACOS X Server support.  (Thanks to Andrew Stone.)
- - Changed the Solaris threads code to ignore stack limits > 8 MB with
-   a warning.  Empirically, it is not safe to access arbitrary pages
-   in such large stacks.  And the dirty bit implementation does not
-   guarantee that none of them will be accessed.
- - Integrated Martin Tauchmann's Amiga changes.
- - Integrated James Dominy's OpenBSD/SPARC port.
-
-Since 5.0alpha1
- - Fixed bugs introduced in alpha1 (OpenBSD & large block initialization).
- - Added -DKEEP_BACK_PTRS and backptr.h interface.  (The implementation
-   idea came from Al Demers.)
-
-Since 5.0alpha2
- - Added some highly incomplete code to support a copied young generation.
-   Comments on nursery.h are appreciated.
- - Changed -DFIND_LEAK, -DJAVA_FINALIZATION, and -DFINALIZE_ON_DEMAND,
-   so the same effect could be obtained with a runtime switch.   This is
-   a step towards standardizing on a single dynamic GC library.
- - Significantly changed the way leak detection is handled, as a consequence
-   of the above.
-
-Since 5.0 alpha3
- - Added protection fault handling patch for Linux/M68K from Fergus
-   Henderson and Roman Hodek.
- - Removed the tests for SGI_SOURCE in new_gc_alloc.h.  This was causing that
-   interface to fail on nonSGI platforms.
- - Changed the Linux stack finding code to use /proc, after changing it
-   to use HEURISTIC1.  (Thanks to David Mossberger for pointing out the
-   /proc hook.)
- - Added HP/UX incremental GC support and HP/UX 11 thread support.
-   Thread support is currently still flakey.
- - Added basic Linux/IA64 support.
- - Integrated Anthony Green's PicoJava support.
- - Integrated Scott Ananian's StrongARM/NetBSD support.
- - Fixed some fairly serious performance bugs in the incremental
-   collector.  These have probably been there essentially forever.
-   (Mark bits were sometimes set before scanning dirty pages.
-   The reclaim phase unnecessarily dirtied full small object pages.)
- - Changed the reclaim phase to ignore nearly full pages to avoid
-   touching them.
- - Limited GC_black_list_spacing to roughly the heap growth increment.
- - Changed full collection triggering heuristic to decrease full GC
-   frequency by default, but to explicitly trigger full GCs during
-   heap growth.  This doesn't always improve things, but on average it's
-   probably a win.
- - GC_debug_free(0, ...) failed.  Thanks to Fergus Henderson for the
-   bug report and fix.
-
-Since 5.0 alpha4
- - GC_malloc_explicitly_typed and friends sometimes failed to
-   initialize first word.
- - Added allocation routines and support in the marker for mark descriptors
-   in a type structure referenced by the first word of an object.  This was
-   introduced to support gcj, but hopefully in a way that makes it
-   generically useful.
- - Added GC_requested_heapsize, and inhibited collections in nonincremental
-   mode if the actual used heap size is less than what was explicitly
-   requested.
- - The Solaris pthreads version of GC_pthread_create didn't handle a NULL
-   attribute pointer.  Solaris thread support used the wrong default thread
-   stack size.  (Thanks to Melissa O'Neill for the patch.)
- - Changed PUSH_CONTENTS macro to no longer modify first parameter.
-   This usually doesn't matter, but it was certainly an accident waiting
-   to happen ...
- - Added GC_register_finalizer_no_order and friends to gc.h.  They're
-   needed by Java implementations.
- - Integrated a fix for a win32 deadlock resulting from clock() calling
-   malloc.  (Thanks to Chris Dodd.)
- - Integrated Hiroshi Kawashima's port to Linux/MIPS.  This was designed
-   for a handheld platform, and may or may not be sufficient for other
-   machines.
- - Fixed a va_arg problem with the %c specifier in cordprnt.c.  It appears
-   that this was always broken, but recent versions of gcc are the first to
-   report the (statically detectable) bug.
- - Added an attempt at a more general solution to dlopen races/deadlocks.
-   GC_dlopen now temporarily disables collection.  Still not ideal, but ...
- - Added -DUSE_I686_PREFETCH, -DUSE_3DNOW_PREFETCH, and support for IA64
-   prefetch instructions.  May improve performance measurably, but I'm not
-   sure the code will run correctly on processors that don't support the
-   instruction.  Won't build except with very recent gcc.
- - Added caching for header lookups in the marker.  This seems to result
-   in a barely measurable performance gain.  Added support for interleaved
-   lookups of two pointers, but unconfigured that since the performance
-   gain is currently near zero, and it adds to code size.
- - Changed Linux DATA_START definition to check both data_start and
-   __data_start, since nothing else seems to be portable.
- - Added -DUSE_LD_WRAP to optionally take advantage of the GNU ld function
-   wrapping mechanism.  Probably currently useful only on Linux.
- - Moved some variables for the scratch allocator into GC_arrays, on
-   Martin Hirzel's suggestion.
- - Fixed a win32 threads bug that caused the collector to not look for
-   interior pointers from one of the thread stacks without
-   ALL_INTERIOR_POINTERS.  (Thanks to Jeff Sturm.)
- - Added Mingw32 support.  (Thanks again to Jeff Sturm for the patch.)
- - Changed the alpha port to use the generic register scanning code instead
-   of alpha_mach_dep.s.  Alpha_mach_dep.s doesn't look for pointers in fp
-   registers, but gcc sometimes spills pointers there.  (Thanks to Manuel
-   Serrano for helping me debug this by email.)  Changed the IA64 code to
-   do something similar for similar reasons.
-
-[5.0alpha5 doesn't really exist, but it may have escaped.]
-
-Since 5.0alpha6:
- - -DREDIRECT_MALLOC was broken in alpha6. Fixed.
- - Cleaned up gc_ccp.h slightly, thus also causing the HP C++ compiler to
-   accept it.
- - Removed accidental reference to dbg_mlc.c, which caused dbg_mlc.o to be
-   linked into every executable.
- - Added PREFETCH to bitmap marker.  Changed it to use the header cache.
- - GC_push_marked sometimes pushed one object too many, resulting in a
-   segmentation fault in GC_mark_from_mark_stack.  This was probably an old
-   bug.  It finally showed up in gctest on win32.
- - Gc_priv.h erroneously #defined GC_incremental to be TRUE instead of FALSE
-   when SMALL_CONFIG was defined.  This was no doubt a major performance bug for
-   the default win32 configuration.
- - Removed -DSMALL_CONFIG from NT_MAKEFILE.  It seemed like an anchronism now
-   that the average PC has 64MB or so.
- - Integrated Bryce McKinley's patches for linux threads and dynamic loading
-   from the libgcj tree.  Turned on dynamic loading support for Linux/PPC.
- - Changed the stack finding code to use environ on HP/UX.  (Thanks
-   to Gustavo Rodriguez-Rivera for the suggestion.)  This should probably
-   be done on other platforms, too.  Since I can't test those, that'll
-   wait until after 5.0.
-
-Since 5.0alpha7:
- - Fixed threadlibs.c for linux threads.  -DUSE_LD_WRAP was broken and
-   -ldl was omitted.  Fixed Linux stack finding code to handle
-   -DUSE_LD_WRAP correctly.
- - Added MSWIN32 exception handler around marker, so that the collector
-   can recover from root segments that are unmapped during the collection.
-   This caused occasional failures under Windows 98, and may also be
-   an issue under Windows NT/2000.
-
-Since 5.0
- - Fixed a gc.h header bug which showed up under Irix.  (Thanks to
-   Dan Sullivan.)
- - Fixed a typo in GC_double_descr in typd_mlc.c.
-   This probably could result in objects described by array descriptors not
-   getting traced correctly.  (Thanks to Ben Hutchings for pointing this out.)
- - The block nearly full tests in reclaim.c were not correct for 64 bit
-   environments.  This could result in unnecessary heap growth under unlikely
-   conditions.
-
-Since 5.1
- - dyn_load.c declared GC_scratch_last_end_ptr as an extern even if it
-   was defined as a macro.  This prevented the collector from building on
-   Irix.
- - We quietly assumed that indirect mark descriptors were never 0.
-   Our own typed allocation interface violated that.  This could result
-   in segmentation faults in the marker with typed allocation.
- - Fixed a _DUSE_MUNMAP bug in the heap block allocation code.
-   (Thanks to Ben Hutchings for the patch.)
- - Taught the collector about VC++ handling array operator new.
-   (Thanks again to Ben Hutchings for the patch.)
- - The two copies of gc_hdrs.h had diverged.  Made one a link to the other
-   again.
-
-Since 5.2  (A few 5.2 patches are not in 6.0alpha1)
- - Fixed _end declaration for OSF1.
- - There were lots of spurious leak reports in leak detection mode, caused
-   by the fact that some pages were not being swept, and hence unmarked
-   objects weren't making it onto free lists.  (This bug dated back to 5.0.)
- - Fixed a typo in the liblinuxgc.so Makefile rule.
- - Added the GetExitCodeThread to Win32 GC_stop_world to (mostly) work
-   around a Windows 95 GetOpenFileName problem.  (Thanks to Jacob Navia.)
-
-Since 5.3
- - Fixed a typo that prevented compilation with -DUSE_3DNOW_PREFETCH.
-   (Thanks to Shawn Wagner for actually testing this.)
- - Fixed GC_is_thread_stack in solaris_threads.c.  It forgot to return a value
-   in the common case.  I wonder why nobody noticed?
- - Fixed another silly syntax problem in GC_double_descr.  (Thanks to
-   Fergus Henderson for finding it.)
- - Fixed a GC_gcj_malloc bug: It tended to release the allocator lock twice.
-
-Since 5.4  (A few 5.3 patches are not in 6.0alpha2)
- - Added HP/PA prefetch support.
- - Added -DDBG_HDRS_ALL and -DSHORT_DBG_HDRS to reduce the cost and improve
-   the reliability of generating pointer backtrace information, e.g. in
-   the Bigloo environment.
- - Added parallel marking support (-DPARALLEL_MARK).  This currently
-   works only under IA32 and IA64 Linux, but it shouldn't be hard to adapt
-   to other platforms.  This is intended to be a lighter-weight (less
-   new code, probably not as scalable) solution than the work by Toshio Endo
-   et al, at the University of Tokyo.  A number of their ideas were
-   reused, though the code wasn't, and the underlying data structure
-   is significantly different.  In particular, we keep the global mark
-   stack as a single shared data structure, but most of the work is done
-   on smaller thread-local mark stacks.
- - Changed GC_malloc_many to be cheaper, and to require less mutual exclusion
-   with -DPARALLEL_MARK.
- - Added full support for thread local allocation under Linux
-   (-DTHREAD_LOCAL_ALLOC).  This is a thin veneer on GC_malloc_many, and
-   should be easily portable to other platforms, especially those that
-   support pthreads.
- - CLEAR_DOUBLE was not always getting invoked when it should have been.
- - GC_gcj_malloc and friends used different out of memory handling than
-   everything else, probably because I forgot about one when I implemented
-   the other.  They now both call GC_oom_fn(), not GC_oom_action().
- - Integrated Jakub Jelinek's fixes for Linux/SPARC.
- - Moved GC_objfreelist, GC_aobjfreelist, and GC_words_allocd out of
-   GC_arrays, and separately registered the first two as excluded roots.
-   This makes code compiled with gc_inl.h less dependent on the
-   collector version.  (It would be nice to remove the inclusion of
-   gc_priv.h by gc_inl.h completely, but we're not there yet.  The
-   locking definitions in gc_priv.h are still referenced.)
-   This change was later coniditoned on SEPARATE_GLOBALS, which
-   is not defined by default, since it involves a performance hit.
- - Register GC_obj_kinds separately as an excluded root region.  The
-   attempt to register it with GC_arrays was usually failing.  (This wasn't
-   serious, but seemed to generate some confusion.) 
- - Moved backptr.h to gc_backptr.h.
-
-Since 6.0alpha1
- - Added USE_MARK_BYTES to reduce the need for compare-and-swap on platforms
-   for which that's expensive.
- - Fixed a locking bug ib GC_gcj_malloc and some locking assertion problems.
- - Added a missing volatile to OR_WORD and renamed the parameter to
-   GC_compare_and_swap so it's not a C++ reserved word.  (Thanks to
-   Toshio Endo for pointing out both of those.)
- - Changed Linux dynamic library registration code to look at /proc/self/maps
-   instead of the rld data structures when REDIRECT_MALLOC is defined.
-   Otherwise some of the rld data data structures may be prematurely garbage
-   collected.  (Thanks to Eric Benson for helping to track this down.)
- - Fixed USE_LD_WRAP a bit more, so it should now work without threads.
- - Renamed XXX_THREADS macros to GC_XXX_THREADS for namespace correctness.
-   Tomporarily added some backward compatibility definitions.  Renamed
-   USE_LD_WRAP to GC_USE_LD_WRAP.
- - Many MACOSX POWERPC changes, some additions to the gctest output, and
-   a few minor generic bug fixes.  (Thanks to Dietmar Planitzer.)
-
-Since 6.0 alpha2
- - Fixed the /proc/self/maps code to not seek, since that apparently is not
-   reliable across all interesting kernels.
- - Fixed some compilation problems in the absence of PARALLEL_MARK
-   (introduced in alpha2).
- - Fixed an algorithmic problem with PARALLEL_MARK.  If work needs to
-   be given back to the main mark "stack", the BOTTOM entries of the local
-   stack should be given away, not the top ones.  This has substantial
-   performance impact, especially for > 2 processors, from what I can tell.
- - Extracted gc_lock.h from gc_priv.h.  This should eventually make it a
-   bit easier to avoid including gc_priv.h in clients.
- - Moved all include files to include/ and removed duplicate links to the
-   same file.  The old scheme was a bad idea because it was too easy to get the
-   copies out of sync, and many systems don't support hard links.
-   Unfortunately, it's likely that I broke some of the non-Unix Makefiles in
-   the process, although I tried to update them appropriately.
- - Removed the partial support for a copied nursery.  It's not clear that
-   this would be a tremendous win, since we don't consistently lose to
-   generational copying collectors.  And it would significantly complicate
-   many things.  May be reintroduced if/when it really turns out to win.
- - Removed references to IRIX_JDK_THREADS, since I believe there never
-   were and never will be any clients.
- - Added some code to linux_threads.c to possibly support HPUX threads
-   using the Linux code.  Unfortunately, it doesn't work yet, and is
-   currently disabled.
- - Added support under Linux/X86 for saving the call chain, both in (debug)
-   objects for client debugging, and in GC_arrays._last_stack for GC
-   debugging.  This was previously supported only under Solaris.  It is
-   not enabled by default under X86, since it requires that code be compiled
-   to explicitly dave frame pointers on the call stack.  (With gcc this
-   currently happens by default, but is often turned off explicitly.)
-   To turn it on, define SAVE_CALL_CHAIN.
- 
-Since 6.0 alpha3
- - Moved up the detection of mostly full blocks to the initiatiation of the
-   sweep phase.  This eliminates some lock conention in the PARALLEL_MARK case,
-   as multiple threads try to look at mostly full blocks concurrently.
- - Restored the code in GC_malloc_many that grabs a prefix of the global
-   free list.  This avoids the case in which every GC_malloc_many call
-   tries and fails to allocate a new heap block, and the returns a single
-   object from the global free list.
- - Some minor fixes in new_hblk.c.  (Attempted to build free lists in order
-   of increasing addresses instead of decreasing addresses for cache performance
-   reasons.  But this seems to be only a very minor gain with -DEAGER_SWEEP,
-   and a loss in other cases.  So the change was backed out.)
- - Fixed some of the documentation.  (Thanks in large part to Fergus
-   Henderson.)
- - Fixed the Linux USE_PROC_FOR_LIBRARIES code to deal with apps that perform
-   large numbers of mmaps.  (Thanks to Eric Benson.)  Also fixed that code to
-   deal with short reads.
- - Added GC_get_total_bytes(). 
- - Fixed leak detection mode to avoid spurious messages under linuxthreads.
-   (This should also now be easy for the other supported threads packages.
-   But the code is tricky enough that I'm hesitant to do it without being able
-   to test.  Everything allocated in the GC thread support itself should be
-   explicitly deallocated.)
- - Made it possible (with luck) to redirect malloc to GC_local_malloc.
-
-Since 6.0 alpha4
- - Changed the definition of GC_pause in linux_threads.c to use a volatile
-   asm.  Some versions of gcc apparently optimize away writes to local volatile
-   variables.  This caused poor locking behaviour starting at about
-   4 processors.
- - Added GC_start_blocking(), GC_end_blocking() calls and wrapper for sleep
-   to linux_threads.c.
-   The first two calls could be used to generally avoid sending GC signals to
-   blocked threads, avoiding both premature wakeups and unnecessary overhead.
- - Fixed a serious bug in thread-local allocation.  At thread termination,
-   GC_free could get called on small integers.  Changed the code for thread
-   termination to more efficiently return left-over free-lists.
- - Integrated Kjetil Matheussen's BeOS support.
- - Rearranged the directory structure to create the doc and tests
-   subdirectories.
- - Sort of integrated Eric Benson's patch for OSF1.  This provided basic
-   OSF1 thread support by suitably extending hpux_irix_threads.c.  Based
-   on earlier email conversations with David Butenhof, I suspect that it
-   will be more reliable in the long run to base this on linux_threads.c
-   instead.  Thus I attempted to patch up linux_threads.c based on Eric's code.
-   The result is almost certainly broken, but hopefully close enough that
-   someone with access to a machine can pick it up.
- - Integrated lots of minor changes from the NetBSD distribution.  (These
-   were supplied by David Brownlee.  I'm not sure about the original
-   authors.)
- - Hacked a bit more on the HP/UX thread-support in linux_threads.c.  It
-   now appears to work in the absence of incremental collection.  Renamed
-   hpux_irix_threads.c back to irix_threads.c, and removed the attempt to
-   support HPUX there.
- - Changed gc.h to define _REENTRANT in cases in which it should already
-   have been defined. It is still safer to also define it on the command
-   line. 
-
-Since 6.0alpha5:
- - Changed the definition of DATASTART on ALPHA and IA64, where data_start
-   and __data_start are not defined by earlier versions of glibc.  This might
-   need to be fixed on other platforms as well.
- - Changed the way the stack base and backing store base are found on IA64.
-   This should now remain reliable on future kernels.  But since it relies
-   on /proc, it will no longer work in the simulated NUE environment.
- - Made the call to random() in dbg_mlc.c with -DKEEP_BACK_PTRS dependent
-   on the OS.  On non-Unix systems, rand() should be used instead.  Handled
-   small RAND_MAX.  (Thanks to Peter Ross for pointing this out.)
- - Fixed the cord make rules to create the cord subdirectory, if necessary.
-   (Thanks to Doug Moen.)
- - Changed fo_object_size calculation in finalize.c.  Turned finalization
-   of nonheap object into a no-op.  Removed anachronism from GC_size()
-   implementation.
- - Changed GC_push_dirty call in solaris_threads.c to GC_push_selected.
-   It was missed in a previous renaming. (Thanks to Vladimir Tsichevski
-   for pointing this out.)
- - Arranged to not not mask SIGABRT in linux_threads.c.  (Thanks to Bryce
-   McKinlay.) 
- - Added GC_no_dls hook for applications that want to register their own
-   roots.
- - Integrated Kjetil Matheussen's Amiga changes.
- - Added FREEBSD_STACKBOTTOM.  Changed the X86/FreeBSD port to use it.
-   (Thanks to Matthew Flatt.)
- - Added pthread_detach interception for platforms supported by linux_threads.c
-   and irix_threads.c.  Should also be added for Solaris?
- - Changed the USE_MMAP code to check for the case in which we got the
-   high end of the address space, i.e. mem_ptr + mem_sz == 0.  It appears
-   that this can happen under Solaris 7.  It seems to be allowed by what
-   I would claim is an oversight in the mmap specification.  (Thanks to Toshio
-   Endo for pointing out the problem.)
- - Cleanup of linux_threads.c.  Some code was originally cloned from
-   irix_threads.c and now unnecessary.  Some comments were obviously wrong.
- - (Mostly) fixed a longstanding problem with setting of dirty bits from
-   a signal handler.  In the presence of threads, dirty bits could get lost,
-   since the etting of a bit in the bit vector was not atomic with respect
-   to other updates.  The fix is 100% correct only for platforms for which
-   GC_test_and_set is defined.  The goal is to make that all platforms with
-   thread support.  Matters only if incremental GC and threads are both
-   enabled.
- - made GC_all_interior_pointers (a.k.a. ALL_INTERIOR_POINTERS) an
-   initialization time, instead of build-time option.  This is a 
-   nontrivial, high risk change.  It should slow down the code measurably
-   only if MERGE_SIZES is not defined, which is a very nonstandard
-   configuration.   
- - Added doc/README.environment, and implemented what it describes.  This
-   allows a number of additional configuration options to be set through
-   the environment.  It documents a few previously undocumented options.
- - Integrated Eric Benson's leak testing improvements.
- - Removed the option to throw away the beginning of each page (DISCARD_WORDS).
-   This became less and less useful as processors enforce stricter alignment.
-   And it hadn't been tested in ages, and was thus probably broken anyway.
-
-Since 6.0alpha6:
- - Added GC_finalizer_notifier.  Fixed GC_finalize_on_demand.  (The variable
-   actually wasn't being tested at the right points.  The build-time flag
-   was.)
- - Added Tom Tromey's S390 Linux patch.
- - Added code to push GC_finalize_now in GC_push_finalizer_structures.
-   (Thanks to Matthew Flatt.)
- - Added GC_push_gc_structures() to push all GC internal roots.
- - Integrated some FreeBSD changes from Matthew Flatt.
- - It looks like USRSTACK is not always correctly defined under Solaris.
-   Hacked gcconfig.h to attempt to work around the problem.  The result
-   is not well tested.  (Thanks again to Matthew Flatt for pointing this
-   out.  The gross hack is mine. - HB)
- - Added Ji-Yong Chung's win32 threads and C++ fixes.
- - Arranged for hpux_test_and_clear.s to no longer be needed or built.
-   It was causing build problems with gas, and it's not clear this is
-   better than the pthreads alternative on this platform.
- - Some MINGW32 fixes from Hubert Garavel.
- - Added Initial Hitachi SH4 port from Kaz Kojima.
- - Ported thread-local allocation and parallel mark code to HP/UX on PA_RISC.
- - Made include/gc_mark.h more public and separated out the really private
-   pieces.  This is probably still not quite sufficient for clients that
-   want to supply their own kind of type information.  But it's a start.
-   This involved lots of identifier renaming to make it namespace clean.
- - Added GC_dont_precollect for clients that need complete control over
-   the root set.
- - GC_is_visible didn't do the right thing with gcj objects.  (Not that
-   many people are likely to care, but ...)
- - Don't redefine read with GC_USE_LD_WRAP.
- - Initial port to LINUX/HP_PA.  Incremental collection and threads are not
-   yet supported.  (Incremental collection should work if you have the
-   right kernel.  Threads may work with a sufficiently patched pthread
-   library.)
- - Changed gcconfig.h to recognize __i386__ as an alternative to i386 in
-   many places.  (Thanks to Benjamin Lerman.)
- - Made win32_threads.c more tolerant of detaching a thread that it didn't
-   know about.  (Thanks to Paul Nash.)
- - Added Makefile.am and configure.in from gcc to the distribution, with
-   minimal changes.  For the moment, those are just placeholders.  In the
-   future, we're planning to switch to a GNU-style build environment for
-   Un*x-like systems, though the old Makefile will remain as a backup.
- - Turned off STUBBORN_ALLOC by default, and added it back as a Makefile
-   option.
- - Redistributed some functions between malloc.c and mallocx.c, so that
-   simple statically linked apps no longer pull in mallocx.o.
- - Changed large object allocation to clear the first and last few words
-   of each block before releassing the lock.  Otherwise the marker could see
-   objects with nonsensical type descriptors.
- - Fixed a couple of subtle problems that could result in not recognizing
-   interior pointers from the stack.  (I believe these were introduced
-   in 6.0alpha6.)
- - GC_debug_free_inner called GC_free, which tried to reacquire the
-   allocator lock, and hence deadlocked.  (DBG_HDRS_ALL probably never worked
-   with threads?)
- - Fixed several problems with back traces.  Accidental references to a free
-   list could cause the free list pointer to be overwritten by a back pointer.
-   There seemed to be some problems with the encoding of root and finalizer
-   references.
-  
-Since 6.0alpha7:
- - Changed GC_debug_malloc_replacement and GC_debug_realloc_replacement
-   so that they compile under Irix.  (Thanks to Dave Love.)
- - Updated powerpc_macosx_mach_dep.s so that it works if the collector
-   is in a dynamic library.  (Thanks to Andrew Begel.)
- - Transformed README.debugging into debugging.html, updating and
-   expanding it in the process.  Added gcdescr.html and tree.html
-   from the web site to the GC distribution.
- - Fixed several problems related to PRINT_BLACK_LIST. This involved
-   restructuring some of the marker macros.
- - Fixed some problems with the sizing of objects with debug information.
-   Finalization was broken KEEP_BACK_PTRS or PRINT_BLACK_LIST.  Reduced the
-   object size with SHORT_DEBUG_HDRS by another word.
- - The "Needed to allocate blacklisted ..." warning had inadvertently
-   been turned off by default, due to a buggy test in allchblk.c.  Turned
-   it back on.
- - Removed the marker macros to deal with 2 pointers in interleaved fashion.
-   They were messy and the performance improvement seemed minimal.  We'll
-   leave such scheduling issues to the compiler.
- - Changed Linux/PowerPC test to also check for __powerpc__ in response
-   to a discussion on the gcc mailing list.
- - On Matthew Flatt's suggestion removed the "static" from the jmp_buf
-   declaration in GC_generic_push_regs.  This was causing problems in
-   systems that register all of their own roots.  It looks far more correct
-   to me without the "static" anyway. 
- - Fixed several problems with thread local allocation of pointerfree or
-   typed objects.  The collector was reclaiming thread-local free lists, since
-   it wasn't following the link fields.
- - There was apparently a long-standing race condition related to multithreaded
-   incremental collection.  A collection could be started and a thread stopped
-   between the memory unprotect system call and the setting of the
-   corresponding dirt bit.  I believe this did not affect Solaris or PCR, which
-   use a different dirty-bit implementation.  Fixed this by installing
-   signal handlers with sigaction instead of signal, and disabling the thread
-   suspend signal while in the write-protect handler.  (It is unclear
-   whether this scenario ever actually occurred.  I found it while tracking
-   down the following:)
- - Incremental collection did not cooperate correctly with the PARALLEL_MARK
-   implementation of GC_malloc_many or the local_malloc primitves.  It still
-   doesn't work well, but it shouldn't lose memory anymore.
- - Integrated some changes from the gcc source tree that I had previously
-   missed.  (Thanks to Bryce McKinley for the reminder/diff.)
- - Added Makefile.direct as a copy of the default Makefile, which would
-   normally be overwritten if configure is run.
- - Changed the gc.tar target in Makefile.direct to embed the version number
-   in the gc directory name.  This will affect future tar file distributions.
- - Changed the Irix dynamic library finding code to no longer try to
-   eliminate writable text segments under Irix6.x, since that is probably no
-   longer necessary, and can apparently be unsafe on occasion.  (Thanks to
-   Shiro Kawai for pointing this out.)
- - GC_cleanup with GC_DEBUG enabled passed a real object base address to
-   GC_debug_register_finalizer_ignore_self, which expected a pointer past the
-   debug header.  Call GC_register_finalizer_ignore_self instead, even with
-   debugging enabled.  (Thanks to Jean-Daniel Fekete for catching this.)
- - The collector didn't build with call chain saving enabled but NARGS=0.
-   (Thanks to Maarten Thibaut.)
- - Fixed up the GNU-style build files enough so that they work in some
-   obvious cases.
- - Added initial port to Digital Mars compiler for win32. (Thanks to Walter
-   Bright.)
-
-Since 6.0alpha8:
- - added README.macros.
- - Made gc.mak a symbolic link to work around winzip's tendency to ignore
-   hard links.
- - Simplified the setting of NEED_FIND_LIMIT in os_dep.c, possibly breaking
-   it on untested platforms.
- - Integrated initial GNU HURD port. (Thanks to Chris Lingard and Igor
-   Khavkine.)
- - A few more fixes for Digital Mars compiler (Walter Bright).
- - Fixed gcc version recognition.  Renamed OPERATOR_NEW_ARRAY to
-   GC_OPERATOR_NEW_ARRAY.  Changed GC_OPERATOR_NEW_ARRAY to be the default.
-   It can be overridden with -DGC_NO_OPERATOR_NEW_ARRAY.  (Thanks to
-   Cesar Eduardo Barros.) 
- - Changed the byte size to free-list mapping in thread local allocation
-   so that size 0 allocations are handled correctly.
- - Fixed Linux/MIPS stackbottom for new toolchain. (Thanks to Ryan Murray.)
- - Changed finalization registration to invoke GC_oom_fn when it runs out
-   of memory.
- - Removed lvalue cast in finalize.c.  This caused some debug configurations
-   not to build with some non-gcc compilers.
-
-Since 6.0alpha9:
- - Two more bug fixes for KEEP_BACK_PTRS and DBG_HDRS_ALL.
- - Fixed a stack clearing problem that resulted in SIGILL with a
-   misaligned stack pointer for multithreaded SPARC builds.
- - Integrated another HURD patch (thanks to Igor Khavkine).
-
-Since 6.0:
- - Non-debug, atomic allocations could result in bogus smashed object
-   reports with debugging on.  (Thanks to Patrick Doyle for the small
-   test case.)
- - Fixed GC_get_register_stack_base (Itanium only) to work around a glibc
-   2.2.4 bug.
- - Initial port to HP/UX on Itanium.  Thread support and both 32 and 64
-   bit ABIs appear to work.  Parallel mark support doesn't yet, due to
-   some inline assembly code issues.  Thread local allocation does appear
-   to work.
- - ifdef'ed out glibc2.1/Itanium workaround.  I suspect nobody is using
-   that combination anymore.
- - Added a patch to make new_gc_alloc.h usable with gcc3.0.  (Thanks to
-   Dimitris Vyzovitis for the patch.)
- - Debugged 64-bit support on HP/UX PA-RISC.
- - Turned on dynamic loading support for FreeBSD/ELF.  (Thanks to Peter
-   Housel.)
- - Unregistering of finalizers with debugging allocation was broken.
-   (Thanks to Jani Kajala for the test case.)
- - Old finalizers were not returned correctly from GC_debug_register_finalizer.
- - Disabled MPROTECT_VDB for Linux/M68K based on a report that it doesn't work.
- - Cleaned up some statistics gathering code in reclaim.c (Thanks to Walter
-   Bright.)
- - Added some support for OpenBSD/ELF/Linux.  (Thanks to Suzuki Toshiya.)
- - Added Jakub Jelinek's patch to use dl_iterate_phdr for dynamic library
-   traversal to dyn_load.c.  Changed it to weakly reference dl_iterate_phdr,
-   so that the old code is stilll used with old versions of glibc.
- - Cleaned up feature test macros for various threads packages and
-   integrated (partially functional) FreeBSD threads code from Loren Rittle.
-   It's likely that the cleanup broke something, since it touched lots of
-   code.  It's also likelly that it fixed some unreported bugs in the
-   less common thread implementations, since some of the original code
-   didn't stand up to close scrutiny.  Support for the next pthreads
-   implementation should be easier to add.
-
-Since 6.1alpha1:
- - No longer wrap read by default in multithreaded applications.  It was
-   pointed out on the libgcj list that this holds the allocation lock for
-   way too long if the read blocks.  For now, reads into the heap are
-   broken with incremental collection.  It's possible to turn this back on
-   if you make sure that read calls don't block (e.g. by calling select
-   first).
- - Fix ifdef in Solaris_threads.h to refer to GC_SOLARIS_THREADS.
- - Added check for environment variable GC_IGNORE_GCJ_INFO.
- - Added printing of stop-the-world GC times if GC_PRINT_STATS environment
-   variable is set.
- - The calloc definition in leak_detector.h was missing parentheses, and
-   realloc was missing a second argument to GC_REALLOC.
-   (Thanks to Elrond (elrond<at>samba-tng.org).)
- - Added GC_PRINT_BACK_HEIGHT environment variable and associated
-   code, mostly in the new file backgraph.c.  See doc/README.environment.
- - Added -DUSE_GLOBAL_ALLOC to work around a Windows NT issue.  (Thanks to
-   Jonathan Clark.)
- - Integrated port to NEC EWS4800 (MIPS-based workstation, with somewhat
-   different address-space layout). This may help for other machines with
-   holes in the data segment.  (Thanks to Hironori Sakamoto.)
- - Changed the order in which GC_push_roots and friends push things onto
-   the mark stack.  GC_push_all calls need to come first, since we can't
-   necessarily recovere if those overflow the mark stack.  (Thanks to
-   Matthew Flatt for tracking down the problem.)
- - Some minor cleanups to mostly support the Intel compiler on Linux/IA64.
-
-Since 6.1 alpha2:
- - Minor cleanup on the gcconfig.h section for SPARC.
- - Minor fix to support Intel compiler for I386/Linux. (Thanks to Sven
-   Hartrumpf.)
- - Added SPARC V9 (64-bit) support.  (Thanks to Jeff Sturm.)
- - Restructured the way in which we determine whether or not to keep
-   call stacks for debug allocation.  By default SAVE_CALL_COUNT is
-   now zero on all platforms.  Added SAVE_CALL_NARGS parameters.
-   If possible, use execinfo.h to capture call stack.  (This should
-   add support for a number of new platforms, though often at
-   considerable runtime expense.)
- - Try to print symbolic information for call stacks.  On Linux, we
-   do this with a combination of execinfo.h and running addr2line in
-   a separate process.  This is both much more expensive and much more
-   useful.  Amazingly, it seems to be fast enough for most purposes.
- - Redefined strdup if -DREDIRECT_MALLOC is given.
- - Changed incremental collector and MPROTECT_VDB implementation so that,
-   under favorable conditions, pointerfree objects are not protected.
-   Added GC_incremental_protection_needs() to determine ahead of time whether
-   pointerfree objects may be protected.  Replaced GC_write_hint() with
-   GC_remove_protection().
- - Added test for GC_ENABLE_INCREMENTAL environment variable.
- - Made GC_time_limit runtime configurable.  Added GC_PAUSE_TIME_TARGET
-   environment variable.
- - Eliminated GC_page_sz, a duplicate of GC_page_size.
- - Caused the Solaris and Irix thread creation primitives to call
-   GC_init_inner().
- 
-Since 6.1alpha3:
- - Fixed typo in sparc_mach_dep.S, preventing the 64-bit version from
-   building.  Increased 64-bit heap size limit in test.c slightly, since
-   a functional SPARC collector seems to slightly exceed the old limits.
-   (Thanks again to Jeff Sturm.)
- - Use NPRGREG in solaris_threads.c, thus printing all registers if things
-   go wrong.
- - Added GC_MARKERS environment variable to allow use of a single marker
-   thread on an MP without confusing the lock implementation.
- - Collect much less aggressively in incremental mode with GC_TIME_UNLIMITED.
-   This is really a purely generational mode, and we can afford to 
-   postpone the collection until the heap is (nearly) full.
- - Remove read() wrapper for MPROTECT_VDB.  It was causing more harm than
-   good.  It is often no longer needed if system calls avoid writing to
-   pointerfull heap objects.
- - Fix MACOSX test in gcconfig.h. (Thanks to John Clements.)
- - Change GC_test_and_set so that it consistently has one argument.
-   Add spaces to ::: in powerpc assembly code in gc_locks.h.
-   (Thanks to Ryan Murray.)
- - Fixed a formatting error in dbg_mlc.c.  Added prototype to GC_abort()
-   declaration.   (Thanks to Michael Smith.)
- - Removed "source" argument to GC_find_start().  Eliminate GC_FIND_START().
- - Added win32 recognition code in configure.in.  Changed some of the
-   dllimport/export defines in gc.h.  (Thanks to Adam Megacz.)
- - GC_malloc_many didn't set hb_last_reclaimed when it called 
-   GC_reclaim_generic.  (I'm not sure this matters much, but ...)
- - Allocating uncollectable objects with debug information sometimes
-   allocated objects that were one byte too small, since uncollectable
-   objects don't have the extra byte added at the end.  (Thanks to
-   Wink Saville for pointing this out.)
- - Added a bit more assertion checking to make sure that gcj objects
-   on free lists never have a nonzero second word.
- - Replaced BCC_MAKEFILE with an up-to-date one.  (Thanks to 
-   Andre Leiradella.)
- - Upgraded libtool, cinfigure.in and some related files to hopefully
-   support NetBSD/SPARC.  (Thanks to Adrian Bunk.)  Unfortunately,
-   libtool 1.4.2 seemed to be buggy due to missing quotes in several
-   "test" invocations.  Fixed those in the ltmain.sh script.
- - Some win32-specific patches, including the introduction of
-   GC_CreateThread.  (Thanks to Adam Megacz.)
- - Merged in gcj changes from Anthony Green to support embedded systems.
- - Tried to consistently rename preprocessed assembly files with a capital
-   .S extension.
- - Use alpha_mach_dep.S on ALPHA again.  It doesn't really matter, but this
-   makes our distribution consistent with the gcc one, avoiding future merge
-   problems.
- - Move GET_MEM definition into gcconfig.h.  Include gcconfig.h slightly
-   later in gc_priv.h to avoid forward references to ptr_t.
- - Add some testing of local allocation to test.c.
- - Change definition of INVALID_QTID in specific.h.  The -1 value was used
-   inconsistently, and too likely to collide with a valid stack address.
-   Some general clean-up of specific.[ch].  Added assertions.  (Thanks
-   to Michael Smith for tracking down an intermittent bug to this
-   general area.  I'm not sure it has been squashed yet, however.)
- - On Pthread systems it was not safe to call GC_malloc() between fork()
-   and exec().  According to the applicable standards, it doesn't appear
-   to be safe to call malloc() or many other libc functions either, thus
-   it's not clear this is fixable.  Added experimental support for
-   -DHANDLE_FORK in linux_threads.c which tries to support it.  It may
-   succeed if libc does the right thing.  I'm not sure whether it does.
-   (Thanks to Kenneth Schalk for pointing out this issue.)
- - Documented thread local allocation primitives to require an
-   explicit GC_init call.  GC_init_parallel is no longer declared to
-   be a constructor function, since that isn't portable and often
-   seems to lead to initialization order problems.
- - Changed gc_cpp.cc and gc_cpp.h in one more attempt to make them
-   compatible with Visual C++ 6.  (Thanks to Wink Saville for the
-   patch.)
- - Some more patches for Linux on HP PA-RISC.
- - Added include/gc_allocator.h.  It implements (hopefully) standard
-   conforming (as opposed to SGI-style) allocators that allocate
-   collectable (gc_allocator) or GC-traceable, but not collectable
-   (traceable_allocator) objects.  This borrows heavily from libstc++,
-   which borrows heavily from the SGI implementation, this part of
-   which was written by Matt Austern.  Changed test_cpp.cc to very
-   minimally test this.
- - On Linux/X86, retry mmap with a different start argument.  That should
-   allow the collector to use more (closer to 3GB) of the address space.
-   (Thanks to Jeffrey Mark Siskind for tracking this down.)
- - Force 64 bit alignment with GCJ support.  (Reflects Bryce McKinley's
-   patch to the gcc tree.)
- - Refined the choice of sa_handler vs. sa_sigaction in GC_dirty_init
-   to accomodate some glibc5 systems.  (Thanks to Dan Fandrich for the
-   patch.)
- - Compensated for the fact that current versions of glibc set
-   __libc_stack_end incorrectly on Linux/IA64 while initialization code
-   is running.  This could cause the collector to miss 16 bytes of
-   the memory stack if GC_malloc or friends where called before main().
- - Mostly integrated Takis Psarogiannakopoulos' port to DG/UX Inix 86.
-   This will probably take another iteration to work, since his
-   patch conflicted with the libtool upgrade. 
- - Added README.arm.cross containing some information about cross-
-   compiling to an ARM processor from Margaret Fleck.
-
-Since 6.1alpha4:
- - Added GC_finalizer_mem_freed, and changed some of the code that
-   decided on heap expansion to look at it.  Memory explicitly
-   deallocated by finalizers essentially needs to be counted as reclaimed
-   by the GC.  Otherwise there are cases in which the heap can grow
-   unboundedly.  (Thanks to Mark Reichert for the test case.)
- - Integrated Adam Megacz patches to not scan dynamic libraries if
-   we are compiling with gcc on win32.  Otherwise we need structured
-   exception handling to deal with asynchronously unmapped root
-   segments, and gcc doesn't directly support that.
- - Integrated Anthony Green's patch to support Wine.
- - GC_OPERATOR_NEW_ARRAY was misspelled OPERATOR_NEW_ARRAY in several
-   places, including gc_cpp.cc.  (Thanks to Wink Saville for pointing
-   this out.)
- - Integrated Loren James Rittle's Alpha FreeBSD patches.  In
-   response to Richard Henderson's suggestion, these also
-   changed the declarations of symbols like _end on many platforms to
-   that they wouldn't mistakenly be declared as short data symbols.
- - Integrated changes from the Debian distribution.  (Thanks to Ryan Murray
-   for pointing these out.)  Fix C++ comments in POWERPC port.  Add ARM32
-   incremental GC support.  Get rid of USE_GENERIC_PUSH_REGS for alpha/Linux,
-   this time for real.  Use va_copy to get rid of cord printf problems
-   (finally).
- - Close file descriptor used to count cpus.  Thanks to Jeff Sturm for
-   pointing out the omission.
- - Don't just drop gcj free lists in GC_start_reclaim, since that can
-   eventually cause the marker to see a bogus mark descriptor in the 
-   dropped objects.  The usual symptom was a very intermittent segmentation
-   fault in the marker.  This mattered only if one of the GC_gcj_malloc
-   variants was used.  (Thanks to Michael Smith, Jeff Sturm, Bryce
-   McKinley and Tom Tromey for helping to track this down.)
- - Fixed Linux and Solaris/64 SPARC configuration.  (Thanks to David Miller,
-   Jeff Sturm, Tom Tromey, and Christian Joensson.)
- - Fixed a typo in strdup definition.  (Thanks to Gerard A Allan.)
- - Changed Makefile.direct to invoke $(CC) to assemble alpha_mach_dep.S.
-   This is needed on Linux.  I'm not sure whether it's better or worse
-   on Tru64.
- - Changed gc_cpp.h once more to declare operator new and friends only in
-   a Microsoft environment.  This may need further fine tuning.  (Thanks to
-   Johannes Schmidt for pointing out that the older code breaks on gcc3.0.4.)
- - Don't ever override strdup if it's already macro defined.  (Thanks to
-   Adnan Ali for pointing out the problem.)
- - Changed gc_cpp.h yet again to also overload placement new.  Due to the
-   C++ overloading rules, the other overloaded new operations otherwise hide
-   placement new, which causes many STL uses to break.  (Thanks to Reza
-   Shahidi for reporting this, and to Matt Austern for proposing a fix.)
- - Integrated cygwin pthreads support from Dan Bonachea.
- - Turn on DYNAMIC_LOADING for NetBSD.  (Thanks to Krister Walfridsson.)
- - Changed printing code to print more complete GC times.
- - Applied Mark Mitchell's Irix patch to correct some bitrot.
- - Clarified which object-printing routines in dbg_mlc.c should hold
-   the allocation lock.  Restructured the code to allow reasonable object
-   printing with -DREDIRECT_MALLOC.
- - Fix the Linux mmap code to always start with 0x1000 as the initial hint.
-   Minor patches for 64-bit AIX, particularly to STACKBOTTOM.
-   (Thanks again to Jeffrey Mark Siskind.)
- - Renamed "SUSPENDED" flag for Solaris threads support to avoid a conflict
-   with a system header. (Thanks to Philp Brown.)
- - Cause win32_threads.c to handle an out of range stack pointer correctly,
-   though currently with a warning.  (Thanks to Jonathan Clark for
-   observing that win32 applications may temporarily use the stack
-   pointer for other purposes, and suggesting a fix.  Unfortunately, it's
-   not clear that there is a complete solution to this problem.)
-
-Since 6.1alpha5:
- - Added GC_MAXIMUM_HEAP_SIZE environment variable.
- - Fix configure.in for MIPS/LINUX. (Thanks to H.J. Lu.)
- - Double page hash table size for -DLARGE_CONFIG.
- - Integrated Bo Thorsen's X86-64 support.
- - STACKBOTTOM definition for LINUX/MIPS was partially changed back.
-   (Thanks to H.J. Lu and Hiroshi Kawashima for resolving this.)
- - Replaced all occurrences of LINUX_DATA_START in gcconfig.h with
-   SEARCH_FOR_DATA_START.  It doesn't hurt to falll back to a search.
-   And __data_start doesn't seem to get defined correctly of the GC
-   library is loaded with LD_PRELOAD, e.g. for leak detection.
- - If the GC_find_leak environment variable is set, do a
-   atexit(GC_gcollect) to give us at least one chance to detect leaks.
-   This may report some very benign leaks, but ...
- - Addeded REDIRECT_FREE.  It's necessary if we want leak detection with
-   LD_PRELOAD.
- - Defer printing of leaked objects, as for smashed objects.
- - Fixed process and descriptor leak in GC_print_callers.  Try for
-   line number even if we got function name.)
- - Ported parallel GC support and thread local allocation to Alpha.
-   Not yet well-tested.
- - Added GC_DUMP_REGULARLY and added finalization statistics to GC_dump().
- - Fixed Makefile.am to mention alpha_mach_dep.S instead of the defunct
-   alpha_mach_dep.s.  (Thanks to Fergus Henderson.)
- - Incorporated a change to new_gc_alloc.h, suggested by Johannes Schmidt,
-   which should make it work with gcc3.1.  (I would still like to encourage
-   use of gc_allocator.h instead.) 
- - Use alpha_mach_dep.S only on Linux.  (It's not clear that this is
-   optimal, but it otherwise didn't build on Tru64.  Thanks to Fergus
-   Henderson.)
- - Added ifdef to guard free() in os_dep.c.  Otherwise we get a
-   compilation error on Irix.  (Thanks to Dai Sato.)
- - Added an experimental version of GC_memalign to mallocx.c.  This can't
-   always work, since we don't handle alignment requests in the hblk-level
-   allocator, and we can't handle arbitrary pointer displacements unless
-   GC_all_interior_pointers is enabled.  But it should work for alignment
-   requests up to HBLKSIZE.  This is not yet documented in the standard
-   places.
- - Finally debugged the OSF1/Tru64 thread support.  This needs more testing,
-   since I needed to add a somewhat unconvincing workaround for signal
-   delivery issues that I don't yet completely understand.  But it does
-   pass my tests, even in parallel GC mode.  Incremental GC support is
-   disabled if thread support is enabled, due to the signal issues.
- - Eliminated name-space-incorrect definition of _cdecl from gc_cpp.h.
- - Added GC_debug_malloc_replacement and GC_debug_realloc_replacement
-   declarations to gc.h.  On IA64, this is required for REDIRECT_MALLOC
-   to work correctly with these.
- - Fixed Linux USE_PROC_FOR_LIBRARIES to work with a 64-bit /proc format.
-
-Since 6.1:
- - Guard the test for GC_DUMP_REGULARLY in misc.c with
-   "#ifndef NO_DEBUGGING".  Otherwise it fails to build with NO_DEBUGGING
-   defined.  (Thanks to Manuel Serrano.)
- - Message about retrying suspend signals was incorrectly generated even when
-   flag was not set.
- - Cleaned up MACOSX/NEXT root registration code.  There was apparently a
-   separate ifdef case in GC_register_data_segments() for no reason.
- - Removed MPROTECT_VDB for MACOSX port, based on one negative report.
- - Arrange for gc.h and friends to be correctly installed with GNU-style
-   "make install".
- - Enable the GNU-style build facility include C++ support in the library
-   with --enable-cplusplus. (Thanks to Thomas Maier for some of the patch.)
- - Mark from GC_thread_key in linux_threads.c, in case that's allocated
-   from the garbage collected heap, as it is with our own thread-specific
-   storage implementation.  (Thanks to Jeff Sturm.)
- - Mark all free list header blocks if they are heap allocated.  This avoids
-   some unnecessary tracing.  And it remains correct if we clear the
-   root set. (Thanks to Jeff Sturm for identifying the bug.)
- - Improved S390/Linux support.  Add S390/Linux 64-bit support.  (Thanks
-   to Ulrich Weigand.)
- - Corrected the spelling of GC_{M,C}ALLOC_EXPLICTLY_TYPED to
-   GC_{M,C}ALLOC_EXPLICITLY_TYPED in gc_typed.h.  This is technically
-   an interface change.  Based on the fact that nobody reported this,
-   I suspect/hope there were no clients.
- - Cleaned up gc_typed.h so that (1) it adds an extern "C" declaration
-   when appropriate, (2) doesn't generate references to undefined internal
-   macros, and (3) allows easier manual construction of descriptors.
- - Close the file descriptor used by GC_print_address_map().
- - Set the "close-on-exec" bit for various file descriptors maintained
-   for the collector's internal use.
- - Added a hack to find memory segments owned by the system allocator
-   under win32.  Based on my tests, this tends to eventually find all
-   segments, though it may take a while.  There appear to be cleaner,
-   but slower solutions under NT/XP.  But they rely on an API that's
-   unsupported under 9X.
- - Changed Linux PowerPC stack finding to LINUX_STACKBOTTOM.  (Thanks
-   to Akira Tagoh for pointing out that HEURISTIC1 doesn't work on
-   64-bit kernels.)
- - Added GC_set_free_space_divisor to avoid some Windows dll issues.
- - Added FIXUP_POINTER, POINTER_SHIFT, POINTER_MASK to allow preprocessing
-   of candidate pointers for tagging, etc.
- - Always lock around GC_notify_full_gc().  Simplified code for
-   invoking GC_notify_full_gc().
- - Changed the way DATASTART is defined on FreeBSD to be robust against
-   an unmapped page after etext.  (Thanks to Hironori Sakamoto for
-   tracking down the intermittent failure.)
- - Made GC_enable() and GC_disable() official.  Deprecated direct update
-   of GC_dont_gc.  Changed GC_gcollect to be a noop when garbage collection
-   is disabled.
- - Call GC_register_dynamic_libraries before stopping the world on Linux,
-   in order to avoid a potential deadlock due to the dl_iterate_phdr lock.
- - Introduced a more general mechanism for platform-dependent code to
-   decide whether the main data segment should be handled separately
-   from dynamic libraries, or registered by GC_register_dynamic_libraries.
-   The latter is more reliable and easier on Linux with dl_iterate_phdr. 
-
-Since 6.2alpha1:
- - Fixed the completely broken FreeBSD code in 6.2alpha1.  (Thanks to
-   Hironori Sakamoto for the patch.)
- - Changed IRIX reference in dbg_mlc.c to IRIX5. (Thanks to Marcus Herbert.)
- - Attempted to work around the problems with .S filenames and the SGI
-   compiler.  (Reported by several people. Untested.)
- - Worked around an HP/UX make issue with the GNU-style build process.
- - Fixed the --enable-cplusplus build machinery to allow builds without
-   a C++ compiler.  (That was always the intent ...)
- - Changed the debugging allocation macros to explicitly pass the return
-   address for Linux and XXXBSD on hardware for which we can't get stack
-   traces.  Use __builtin_return_address(0) to generate it when possible.
-   Some of the configuration work was cleaned up (good) and moved to gc.h
-   (bad, but necessary).  This should make leak detection more useful
-   on a number of platforms.  (Thanks to Fabian Thylman for the suggestion.)
- - Fixed compilation problems in dbg_mlc.c with GC_ADD_CALLER.
- - Bumped revision number for dynamic library.
-
-Since 6.2alpha2:
- - Don't include execinfo.h in os_dep.c when it's not needed, and may not exist.
-
-Since 6.2alpha3:
- - Use LINUX_STACKBOTTOM for >= glibc2.2 on Linux/MIPS.  (See Debian bug
-   # 177204)
- - Integrated Jeff Sturm and Jesse Rosenstock's MACOSX threads patches.
- - Integrated Grzegorz Jakacki's substantial GNU build patch.  "Make dist"
-   should now work for the GNU build process.  Documentation files
-   are installed under share/gc.
- - Tweaked gc_cpp.h to again support the Borland compiler.  (Thanks to
-   Rene Girard for pointing out the problems.)
- - Updated BCC_MAKEFILE (thanks to Rene Girard).
- - Added GC_ASSERT check for minimum thread stack size.
- - Added --enable-gc-assertions.
- - Added some web documentation to the distribution.  Updated it in the
-   process.
- - Separate gc_conf_macros.h from gc.h.
- - Added generic GC_THREADS client-defined macro to set the appropriate
-   GC_XXX_THREADS internal macro.  (gc_config_macros.h.)
- - Add debugging versions of _ignore_off_page allocation primitves.
- - Moved declarations of GC_make_closure and GC_debug_invoke_finalizer
-   from gc.h to gc_priv.h.
- - Reset GC_fail_count even if only a small allocation succeeds.
- - Integrated Brian Alliet's patch for dynamic library support on Darwin.
- - gc_cpp.h's gc_cleanup destructor called GC_REGISTER_FINALIZER_IGNORE_SELF
-   when it should have called the lower case version, since it was
-   explicitly computing a base pointer.
-
-Since 6.2alpha4:
- - GC_invoke_finalizers could, under rare conditions, set
-   GC_finalizer_mem_freed to an essentially random value.  This could
-   possibly cause unbounded heap growth for long-running applications
-   under some conditions.  (The bug was introduced in 6.1alpha5, and
-   is not in gcc3.3.  Thanks to Ben Hutchings for finding it.)
- - Attempted to sanitize the various DLL macros.  GC_USE_DLL disappeared.
-   GC_DLL is used instead.  All internal tests are now on GC_DLL.
-   README.macros is now more precise about the intended meaning.
- - Include DllMain in the multithreaded win32 version only if the
-   collector is actually built as a dll.  (Thanks to Mohan Embar for
-   a version of the patch.)
- - Hide the cygwin threadAttach/Detach functions.  They were violating our
-   namespace rules.  
- - Fixed an assertion in GC_check_heap_proc.  Added GC_STATIC_ASSERT.
-   (Thanks again to Ben Hutchings.)
- - Removed some obsolete definitions for Linux/PowerPC in gcconfig.h.
- - CORD_cat was not rebalancing unbalanced trees in some cases, violating
-   a CORD invariant.  Also tweaked the rebalancing rule for
-   CORD_cat_char_star.  (Thanks to Alexandr Petrosian for the bug report
-   and patch.)
- - Added hand-coded structured exception handling support to mark.c.
-   This should enable support of dynamic libraries under win32 with
-   gcc-compiled code.  (Thanks to Ranjit Mathew for the patch.)
-   Turned on dynamic library scanning for win32/gcc.
- - Removed some remnants of read wrapping.  (Thanks to Kenneth Schalk.)
-   GC_USE_LD_WRAP ws probably broken in recent versions.
- - The build could fail on some platforms since gcconfig.h could include
-   declarations mentioning ptr_t, which was not defined, e.g. when if_mach
-   was built.  (Thanks to Yann Dirson for pointing this out.)  Also
-   cleaned up tests for GC_PRIVATE_H in gcconfig.h a bit. 
- - The GC_LOOP_ON_ABORT environment variable interfered with incremental
-   collection, since the write fault handler was erroneously overridden.
-   Handlers are now set up in the correct order.
- - It used to be possible to call GC_mark_thread_local_free_lists() while
-   the world was not stopped during an incremental GC.  This was not safe.
-   Fortunately, it was also unnecessary.  Added GC_world_stopped flag
-   to avoid it.  (This caused occasional crashes in GC_set_fl_marks
-   with thread local allocation and incremental GC.  This probably happened
-   primarily on old, slow multiprocessors.)
- - Allowed overriding of MAX_THREADS in win32_threads.c from the build
-   command line.  (Patch from Yannis Bres.)
- - Taught the IA64/linux code to determine the register backing store base from
-   /proc/self/maps after checking the __libc symbol, but before guessing.
-   (__libc symbols are on the endangered list, and the guess is likely to not
-   always be right for 2.6 kernels.)  Restructured the code to read and parse
-   /proc/self/maps so it only exists in one place (all platforms).
- - The -DUSE_PROC_FOR_LIBRARIES code was broken on Linux.  It claimed that it
-   also registered the main data segment, but didn't actually do so.  (I don't
-   think anyone actually uses this configuration, but ...)
- - Made another attempt to get --enablecplusplus to do the right thing.
-   Since there are unavoidable problems with C programs linking against a
-   dynamic library that includes C++ code, I separated out the c++ code into
-   libgccpp.
-
-Since 6.2alpha5:
- - There was an extra underscore in the name of GC_save_registers_in_stack
-   for NetBSD/SPARC.  (Thanks to Jaap Boender for the patch.)
- - Integrated Brian Alliet's patch for Darwin.  This restructured the
-   linuxthreads/pthreads support to separate generic pthreads support
-   from more the system-dependent thread-stopping code.  I believe this
-   should make it easier to eliminate the code duplication between
-   pthreads platforms in the future.  The patch included some other
-   code cleanups.
- - Integrated Dan Bonachea's patch to support AIX threads.  This required
-   substantial manual integration, mostly due to conflicts with other
-   recent threads changes.  It may take another iteration to
-   get it to work.
- - Removed HPUX/PA-RISC support from aix_irix_threads.c.  It wasn't used
-   anyway and it cluttered up the code.  And anything we can do to migrate
-   towards generic pthreads support is a good thing.
- - Added a more explicit test for tracing of function arguments to test.c.
-   (Thanks to Dan Grayson.)
- - Added Akira Tagoh's PowerPC64 patch.
- - Fixed some bit rot in the Cygwin port.  (Thanks to Dan Bonachea for
-   pointing it out.)  Gc.h now includes just windows.h, not winbase.h.
- - Declared GC_save_regs_in_stack() in gc_priv.h.  Remove other declarations.
- - Changed --enable-cplusplus to use automake consitionals.  The old way
-   confused libtool.  "Make install" didn't work correctly for the old version.
-   Previously --enable-cplusplus was broken on cygwin.
- - Changed the C version of GC_push_regs to fail at compile time if it is
-   generated with an empty body.  This seems to have been the cause of one
-   or two subtle failures on unusual platforms.  Those failures should
-   now occur at build time and be easily fixable.
-
-Since 6.2alpha6:
- - Integrated a second round of Irix/AIX patches from Dan Bonachea.
-   Renamed mips_sgi_mach_dep.S back to mips_sgi_mach_dep.s, since it requires
-   the Irix assembler to do the C preprocessing; gcc -E doesn't work.
- - Fixed Makefile.direct for DARWIN.  (Thanks to Manuel Serrano.)
- - There was a race between GC_pthread_detach and thread exit that could
-   result in a thread structure being deallocated by GC_pthread_detach
-   eventhough it was still needed by the thread exit code.  (Thanks to
-   Dick Porter for the small test case that allowed this to be debugged.)
- - Fixed version parsing for non-alpha versions in acinclude.m4 and
-   version checking in version.h.
-
-Since 6.2:
- - Integrated some NetBSD patches forwarded to me by Marc Recht.  These
-   were already in the NetBSD package.    
- - GC_pthread_create waited for the semaphore even if pthread_create failed.
-   Thanks to Dick Porter for the pthread_support.c patch.  Applied the
-   analogous fix for aix_irix_threads.c.
- - Added Rainer Orth's Tru64 fixes.
- - The check for exceeding the thread table size in win32 threadDetach
-   was incorrect.  (Thanks to Alexandr Petrosian for the patch.)
- - Applied Andrew Begel's patch to correct some reentrancy issues
-   with dynamic loading on Darwin.
- - GC_CreateThread() was neglecting to duplicate the thread handle in
-   the table.  (Thanks to Tum Nguyen for the patch.)
- - Pass +ESdbgasm only on PA-RISC machines with vendor compiler.
-   (Thanks to Roger Sayle for the patch.)
- - Applied more AIX threads patches from Scott Ananian.
-
-Since 6.3alpha1:
- - Reenabled I_HOLD_LOCK assertion in aix_irix_threads.h.
- - Put back the WINABI qualifier for GC_CreateThread.  (Thanks to
-   Danny Smith for the patch.  6.3alpha1 had the qualifier in one place
-   but not elsewhere, which was clearly wrong.)
- - Sometimes explicitly define __private_extern__ before DARWIN dyld.h
-   include.  (Thanks to Andreas Tobker for postting the patch.)
- - Included signal.h from pthread_support.c.  Removed GC_looping_handler,
-   which was dead code.
- - GC_find_start was misdeclared by gc_pmark.h if PRINT_BLACK_LIST was
-   defined.  (Thanks to Glauco Masotti for testing and reporting this.)
-   Changed GC_find_start to never just return 0.  According to its
-   comment it doesn't, and it's unclear that's correct.
- - GC_alloc_large had several largely compensating bugs in the
-   computation of GC_words_wasted.  (It was confused about bytes vs.
-   words in two places.)
- - Integrated Slava Sysoltev's patch to support more recent versions of
-   the Intel compiler on IA64/Linux.
- - Changed win32 spinlock initialization to conditionally set a spin count.
-   (Emmanual Stumpf pointed out that enabling this makes a large performance
-   difference on win32 multiprocessors.)  Also cleaned up the win32 spinlock
-   initialization code a bit.
- - Fixed thread support for HP/UX/IA64.  The register backing store base for
-   the main thread was sometimes not set correctly.  (Thanks to Laurent
-   Morichetti.)
- - Added -DEMPTY_GETENV_RESULTS flag to work around Wine problem.
- - Declare GC_stack_alloc and GC_stack_free in solaris_threads.h to
-   avoid 64-bit size mismatches.  (Thanks to Bernie Solomon.)
- - Fixed GC_generic_push_regs to avoid a potential and very unfortunate
-   tail call optimization.  This could lead to prematurely reclaimed
-   objects on configurations that used the generic routine and the new
-   build infrastructure (which potentially optimizes mach_dep.c).
-   This was a serious bug, but it's unclear whether it has resulted in
-   any real failures.
- - Fixed CORD_str to deal with signed characters.  (Thanks to Alexandr
-   Petrosian for noticing the problem and supplying the patch.)
- - Merged a couple of NOSYS/ECOS tests into os_dep.c from gcj.  (Thanks
-   to Anthony Green.)
- - Partially merged a win32 patch from Ben Hutchings, and substantially
-   revised other parts of win32_threads.c.  It had several problems.
-   Under MinGW with a statically linked library, the main thread was
-   not registered.  Cygwin detached threads leaked thread descriptors.
-   There were several race conditions.  For now, unfortunately the
-   static threads limit remains, though we increased it, and made table
-   traversal cost depend on the actual thread count.
-   There is also still some code duplication with pthread_support.c.
-   (Thread descriptors did become much smaller, since Ben Hutchings
-   removed the thread context from them.)
- - Integrated a Solaris configure.in patch from Rainer Orth.
- - Added GC_IGNORE_FB and associated warning to very partially address
-   the issue of the collector treating a mapped frame buffer as part
-   of the root set.  (Thanks to David Peroutka for providing some
-   insight.  More would be helpful.  Is there anything that can be used
-   to at least partially identify such memory segments?)
-   
-Since 6.3alpha2:
- - Removed -DSMALL_CONFIG from BCC_MAKEFILE.
- - Changed macros to test for an ARM processor (Patch from Richard Earnshaw.)
- - Mostly applied a DJGPP patch from Doug Kaufman.  Especially Makefile.dj
-   had suffered from serious bit rot.
- - Rewrote GC_apply_to_maps, eliminating an off-by-one subscript error,
-   and a call to alloca (for lcc compatibility).
- - Changed USE_MUNMAP behavior on posixy platforms to immediately remap
-   the memory with PROT_NONE instead of unmapping it.  The latter risks
-   an intervening mmap grabbing the address space out from underneath us.
-   Updated this code to reflect a cleaner patch from Ulrich Drepper.
- - Replaced _T with _Tp in new_gc_alloc.h to avoid a MACOS X conflict.
-   (Patch from Andrew Begel.)
- - Dynamically choose whether or not lock should spin on win32.  (Thanks
-   to Maurizio Vairani for the patch.)  This may be a significant performance
-   improvement for win32.
- - Fix Makefile.direct to actually include NT_STATIC_THREADS_MAKEFILE
-   in the distribution.  (Again thanks to Maurizio Vairani.)
- - Maybe_install_looping_handler() was accidentally exported, violating
-   our name space convention.
- - Made os_dep.c use sigsetjmp and SA_NODEFER for NetBSD.  (Thanks to
-   Christian Limpach.)  (I generalized the patch to use sigsetjmp on all
-   UNIX_LIKE platforms, admittedly a slightly risky move.  But it may avoid
-   similar problems on some other platforms. I also cleaned up the defn
-   of UNIX_LIKE a bit. - Hans)
- - Integrated Andrew Begel's Darwin threads patch, adjusted according to
-   some of Fergus Hendersons's comments.  (Patch didn't apply cleanly,
-   errors are possible.)
- - Added another test or two for the Intel 8.0 compiler to avoid
-   confusing it with gcc.  The single-threaded collector should now build
-   with icc, at least on ia64. 
-
-Since 6.3alpha3:
- - USE_MMAP was broken by confusion in the code dealing with USE_MMAP_ANON.
-   (This was pointed out, and fixes were suggested by several other people.)
- - Darwin supprt was broken in alpha3 as a result of my misintegration of
-   Andrew Begel's patches.  Fixed with another patch from Andrew Begel.
- - A new sanity check in pthread_stop_world.c:GC_push_all_stacks() was
-   overly aggressive.  We may collect from an unregistered thread during
-   thread creation.  Fixed by explicitly checking for that case.  (Added
-   GC_in_thread_creation.)
-
-Since 6.3alpha4:
- - Fix & vs && typo in GC_generic_malloc and
-   GC_generic_malloc_ignore_off_page.  (Propagated from the gcc tree.)
- - Removed SA_NODEFER hack from NetBSD and Solaris write-protect handler.
-   (According to Christian Limpach, the NetBSD problem is fixed.
-   Presumably so is the Solaris 2.3 problem.)
- - Removed placement delete from gc_cpp.h for the SGI compiler.
-   (Thanks to Simon Gornall for the patch.)
- - Changed semantics of the GC_IGNORE_FB environment variable, based 
-   on experimentation by Nicolas Cannasse pointing out that the old
-   interpretation was useless.  We still need help in identifying win32
-   graphics memory mappings.  The current "solution" is a hack.
- - Removed "MAKEOVERRIDES =" from Makefile.am and thus Makefile.in.
-   It probably made more sense in the gcc context.
- - Explicitly ensure that NEED_FIND_LIMIT is defined for {Open,Net}BSD/ELF.
- - Replaced USE_HPUX_TLS macro by USE_COMPILER_TLS, since gcc often
-   supports the same extension on various platforms.
- - Added some basic (completely untested) defines for win64, in support
-   of future work.
- - Declared GC_jmp_buf in os_dep.s as JMP_BUF instead of jmp_buf, fixing
-   a memory overwrite bug on Solaris and perhaps other platforms.
- - Added 0 != __libc_stack_end test to GC_linux_stack_base.  (Thanks to Jakub
-   Jelinek, both for the patch, and for explaining the problem to me.)
-   Otherwise "prelink"ing could cause the collector to fail.
- - Changed default thread local storage implementation to USE_PTHREAD_SPECIFIC
-   for HP/UX with gcc.  The compiler-based implementation appears to work
-   only with the vendor compiler.
- - Export GC_debug_header_size and GC_USR_PTR_FROM_BASE from gc_mark.h,
-   making client mark code cleaner and less dependent on GC version.
- - Export several new procedures and GC_generic_malloc from gc_mark.h
-   to support user-defined kinds.  Use the new procedures to replace existing
-   code in gcj_mlc.c and typd_mlc.c.
- - Added support for GC_BACKTRACES.
- - Fixed a remaining problem in CORD_str with signed characters.  (Thanks
-   to Alexandr Petrosian for the patch.)
- - Removed supposedly redundant, but very buggy, definitions of finalizer
-   macros from javaxfc.h.  Fortunately this file probably has no users.
-   The correct declarations were already in gc.h.
- - Also need to set GC_in_thread_creation while waiting for GC during
-   thread termination, since it is also possible to collect from an
-   unregistered thread in that case.
- - Define NO_GETENV for Windows CE, since getenv doesn't appear to exist.
-   + some other minor WinCE fixes. (Thanks to Alain Novak.)
- - Added GC_register_describe_type_fn.
- - Arrange for debugging finalizer registration to ignore non-heap
-   registrations, since the regular version of the routine also behaves
-   that way.
- - GC_gcj_malloc and friends need to check for finalizers waiting to be run.
-   One of the more obscure allocation routines with missing a LOCK() call.
- - Fixed cvtres invocations in NT_MAKEFILE and NT_STATIC_THREADS_MAKEFILE
-   to work with VS.NET.
- - Cleaned up GC_INIT calls in test.  Updated gc.man to encourage GC_INIT
-   use in portable code.
- - Taught the GC to use libunwind if --enable-full-debug is specified on
-   IA64 and libunwind is present.
- - The USE_MUNMAP code could get confused about the age of a block and
-   prematurely unmap it.  GC_unmap_old had a bug related to wrapping of
-   GC_gc_no.  GC_freehblk and GC_merge_unmapped didn't maintain
-   hb_last_reclaimed reasonably when blocks were merged.  The code was
-   fixed to reflect original intent, but that may not always be an
-   improvement.  See todo list item.
-
-Since 6.3alpha5:
- - Define USE_GENERIC_PUSH_REGS for NetBSD/M68K.
- - Fixed the X86_64 PREFETCH macros to correctly handle ia32e (which uses
-   different prefetch instructions from AMD64).  (Thanks to H.J. Lu.)
- - GC_config_macros.h did not correctly define GC_WIN32_THREADS from
-   GC_THREADS. 
- - Added simple_example.html.
- - Merged Andrew Gray's patch to correctly restore signal handlers on
-   FreeBSD.
- - Merged a patch from Andreas Jaeger to deal with prefetch-related warnings
-   on x86-64.  Added some other casts so that the PREFETCH macros
-   always get a ptr_t argument.  Removed some casts inthe PREFETCH
-   implementations.
- - At Jesse Jones suggestion: Added a header guard for gc_allocator.h
-   and changed GC_debug_free to clobber contents of deallocated object.
- - The signal masking code in pthread_stop_world.c contained some errors.
-   In particular SIGSEGV was masked in the handler, in spite of the fact that
-   it wrote to the heap.  This could lead to an uncaught SIGSEGV, which
-   apparently became much more likely in Linux 2.6.  Also fixed some
-   typos, and reduced code duplication in the same area.
- - Remove ltconfig, clean up configure messages for DGUX (thanks to
-   Adrian Bunk for the patches).
- - Integrated NetBSD/OpenBSD patches from Marc Recht and Matthias Drochner.
-
-Since gc6.3alpha6:
- - Compile test_cpp.cc with CXXCOMPILE instead of COMPILE.
- - Very large allocations could cause a collector hang.  Correct
-   calculation of GC_collect_at_heapsize.
- - GC_print_hblkfreelist printed some bogus results if USE_MUNMAP
-   was defined.
- - The generic GC_THREADS macro didn't work correctly on Solaris,
-   since the implementation failed to include gc_config_macros.h
-   before deciding whether or not to compile the rest of the file.
- - Threadlibs.c failed to expand the generic GC_THREADS macro.
- - Correct MacOSX thread stop code. (Thanks to Dick Porter.)
- - SMALL_OBJ definition was off by one.  This could cause crashes
-   at startup.  (Thanks to Zoltan Varga for narrowing this down to
-   a trivial test case.)
- - Integrate Paolo Molara's patch to deal with a race in the Darwin
-   thread stopping code.
- - Changed X86_64 implementation to use SA_SIGINFO in the MPROTECT_VDB
-   implementation.  The old approach appears to have been broken by
-   recent kernels.
- - Add GC_ATTR_UNUSED to eliminate a warning in gc_allocator.h.  (Thanks
-   to Andrew Begel.)
- - Fix GC_task_self declaration in os_dep.c.  (Thanks to Andrew Pinski.)
- - Increase INITIAL_BUF_SZ in os_dep.c for Solaris /proc reads.
-
-Since 6.3:
- - Merge gcconfig.h changes from gcc tree.
- - Unconditionally include gc_priv.h in solaris_pthreads.c, win32_threads.h,
-   aix_irix_threads.c, and solaris_threads.c to get thread definitions.
- - Start marker threads in GC_thr_init, so that they get started even
-   if no other threads are ever started.  (Oddly enough, the parallel
-   collector worked correctly, though not well, with no helper threads.)
- - Go ahead and split large blocks in GC_allochblk_nth if GC_dont_gc
-   is set.  (Thanks to Alexander Petrossian.)
- - GC_PRINT_BACK_HEIGHT would deadlock with thread support.
- - Let in_progress_space in backgraph.s grow dynamically.
- - Fix README.solaris2.  The GC_thr_init() hack doesn't work anymore.
- - Convert GC_finalizer_mem_freed to bytes in allchblk.c.
- - Add missing declaration for GC_generic_malloc_words_small_inner.
-   Without it, s390x breaks.  (Thanks to Ulrich Weigand.)
- - Applied several MacOSX patches to support older tool chains.
-   (Thanks to Stefan Ring.)
- - Bug fix for NetBSD/amd64.  (Thanks to Marc Recht.)  Add NetBSD/sh3
-   support.  (Thanks to Uchiyama Yasushi.)
- - Fixed an uninitialized variable in cordprnt.c.  (Thanks to gcc for
-   providing the warning.)
- - Eliminated some, but not all, gcc -Wall warnings.
- - Changed some old style casts to reinterpret_cast in new_gc_alloc.h.
-   (Thanks to Dan Grayson.)
- - GC_extend_size_map shouldn't adjust for GC_all_interior_pointers if
-   GC_DONT_ADD_BYTE_AT_END is set.
- - Changed some (long) casts to (word) in preparation for win64.
-   (Thanks to Peter Colson.)
- - Changed "int stack_size" declaration in pthread_support.c to use
-   size_t.  (Only mattered with GC_ASSERTIONS enabled.)
- - Added CRIS (etrax) support.  (Thanks to Simon Posnjak and
-   Hans-Peter Nilsson.)
- - Removed GC_IGNORE_FB frame buffer recognition, and replaced
-   it with a check that the mapping type is MEM_IMAGE.
-   In theory, this should work much better, but it is a high
-   risk change for win32.  (Thanks to Ashley Bone for the crucial
-   experimental data behind this, and to Rutger Ovidus for
-   some further experiments.)
- - Fixed print_block_list to print the correct kind number for
-   STUBBORN.  (Thanks to Rutger Ovidus.)
- - GC_allochblk_nth incremented GC_words_wasted by bytes rather than
-   words.
- - Consider GC_words_wasted in GC_adj_words_allocd only if it is within
-   reason.  (A hack to avoid some extremely unlikely scenarios in which
-   we manage to allocate only "wasted" space.  7.0 has a better fix.)
- - Changed PowerPC GC_clear implementation to use lwsync instead of
-   eieio, since the documentation recommends against eieio, and
-   it seems to be incorrect if the preceding memory op is a load.
- - Fixed print_block_list to print the correct kind number for
-   STUBBORN.  (Thanks to Rutger Ovidus.)
- - Have configure.in generate an error if it is asked to support
-   pthreads, but doesn't know how to.
- - Added Kazuhiro Inaoka's patch for Renesas M32R support.
- - Have the GNU build mechanism link with -ldl.  Rename THREADLIBS
-   to THREADDLLIBS to reflect this.  (Thanks to Sven Verdoolaege.)
- - Added Hannes Mehnert's patch for FreeBSD/SPARC support.
- - Merged some FreeBSD specific patches to threadlibs.c and dyn_load.c.
-   (Thanks tp John Merryweather Cooper.)
- - Define MPROTECT_VDB on MACOSX only if threads are being used, since the
-   dirty page tracking mechanism uses threads.  (This avoids an undefined
-   reference to _GC_darwin_register_mach_handler_thread.)
- - By popular demand, use __libc symbols only if we are built with
-   USE_LIBC_PRIVATES, which is off by default, and not otherwise documented.
- - Ignore GC_enable_incremental() requests when KEEP_BACK_PTRS is set.
-   The GC itself will dirty lots of pages in this cases, probably making
-   it counterproductive on all platforms.  And the DARWIN port crashes.
-
-Since GC6.4:
- - Integrated Paolo Molaro's patch to deal with EINTR in sem_wait.
- - Make GC_approx_sp() write to dummy location to ensure that stack
-   is grown here, when sp looks reasonable, rather than later, when
-   it might look like a bad memory reference.  (Problem was never
-   observed that I know of.  But on rereading the code it seemed
-   dubious.)
- - Separate out GC_with_callee_saves_pushed and sometimes call
-   it from GC_suspend_handler in pthread_stop_world.c.  Callee-save
-   register values sometimes failed to get traced under HP/UX on
-   PA-RISC.  Linux/IA64 had the same problem, though non-stacked
-   callee-save registers seem to be so rarely used there that nobody
-   ever noticed.
- - Integrated an ancient Darwin powerpc_darwin_machine_dep.s patch
-   from Andreas Tobler, which I had lost.
- - Fix compare_and_exchange implementation for gcc/IA64 to deal with
-   pickier compiler versions.
- - Fixed Itanium 32-bit ABI support (HP/UX).  In particular, the
-   compare_and_exchange implementation didn't consider that possibility.
- - Undefine GC_pthread_detach in win32_threads.c.  (Thanks to
-   Tagliapietra Tommaso.)
- - Fixed inclusion of frame.h for NETBSD in os_dep.c.
- - Applied Dan Bonachea's patch to use mmap on AIX.
- - Several fixes to resurrect the Irix port on recent OS versions.
- - Change ALPHA to use LINUX_STACKBOTTOM.
- - Change SPARC64/LINUX to also use LINUX_STACKBOTTOM.  Deal with potential
-   bad values of __libc_stack_end on that platform.  (Thanks to David Miller.)
- - Relax gctest to allow larger heap if ALIGN_DOUBLE isn't set.
-   (Unnecessary in 7.0)
- - Force a define of __STDC__=0 for the IBM compiler on AIX, so that
-   we get prototypes.  (Unnecessary in 7.0)
- - GC_INIT definition for AIX and CYGWIN referred to DATASTART and DATAEND
-   which are only defined in private include files.
- - Integrated some small gcconfig.h patches from Dan Bonachea.  Also
-   relaxed assertion about FreeBSD stack size in pthread_support.c.
- - Integrated Andrew Begel's darwin_stop_world.c patch for 64-bit
-   support.  This may need additional work.
- - Avoided potentially infinite recursion in GC_save_callers if
-   the system backtrace calls malloc.  The workaround currently requires
-   __thread support if this code is used with threads.
- - Avoided another similar infinite recursion by conditionally
-   invoking GC_save_callers in alloc.c.  (Thanks to Matthias Andree
-   for helping to track down both of these.)
- - Removed all traces of aix_irix_threads.c.  AIX and Irix now use
-   pthread_support.c and pthread_stop_world.c.  The old code appeared
-   to be unreliable for AIX, and was not regularly maintained.
- - On Irix, ignore segments with MA_FETCHOP or MA_NOTCACHED attributed;
-   they're not always safe to read.
- - Fixed a previously vacuous assertion (diagnosed by the SGI compiler)
-   in GC_remove_from_fl.
- - Fix stack_size assertion in GC_pthread_create.
- - Fix assertion in GC_steal_mark_stack.
-  
-Since 6.5
- - Fix CPU count detection for Irix and FreeBSD. (Thanks to Dan Bonachea.)
- - Integrate Dan Bonachea's patch for the IBM XLC compiler on Darwin.
- - Integrated Andreas Tobler's FreeBSD/PowerPC patch.
- - Don't access the GC thread structure from the restart handler.  It's
-   unsafe, since the handler may run too late.  (Thanks to Ben Maurer for
-   tracking this down.)
- - Applied Christian Thalinger's patch to change comment syntax in
-   alpha_mach_dep.S.
- - Added test for GC_no_dls in GC_dyld_image_add for DARWIN. (Thanks to
-   Juan Jose Garcia Ripoli).
- - Use LINUX_STACKBOTTOM for Linux/SH and LINUX/ARM. (Thanks to Sugioka
-   Toshinobu and Christian Thalinger.)
- - Rewrote GC_parse_map_entry.  This assumed a fixed column layout of
-   /proc/self/maps on Linux.  This ceased to be true about 2 years ago.
-   The old code is probably quite problemetic with -DREDIRECT_MALLOC.  It
-   is also used by default for IA64, though I haven't seen actual failures
-   there.
- - More consistently define HBLKSIZE to 4096 on 64 bit architectures with
-   4K pages.  (Thanks to Andrew Haley.)
- - With win32 threads, GC_stop_world needs to acquire GC_write_cs.  (Thanks
-   to Ben Hutchings for the observation and patch.)
- - Move up struct callinfo declaration to make gcc 4.0.2. happy.
-
-To do:
- - The USE_MUNMAP code should really use a separate data structure
-   indexed by physical page to keep track of time since last use of
-   a page.  Using hblk headers means we lose track of ages when
-   blocks are merged, and we can't unmap pages that have been allocated and
-   dropped by the blacklisting code.  I suspect both of these matter.
- - A dynamic libgc.so references dlopen unconditionally, but doesn't link
-   against libdl.
- - GC_proc_fd for Solaris is not correctly updated in response to a
-   fork() call.  Thus incremental collection in the child won't work
-   correctly.  (Thanks to Ben Cottrell for pointing this out.)
- - --enable-redirect-malloc is mostly untested and known not to work
-   on some platforms. 
- - There seem to be outstanding issues on Solaris/X86, possibly with
-   finding the data segment starting address.  Information/patches would
-   be appreciated.
- - Very large root set sizes (> 16 MB or so) could cause the collector
-   to abort with an unexpected mark stack overflow.  (Thanks again to
-   Peter Chubb.)  NOT YET FIXED.  Workaround is to increase the initial
-   size.
- - The SGI version of the collector marks from mmapped pages, even
-   if they are not part of dynamic library static data areas.  This
-   causes performance problems with some SGI libraries that use mmap
-   as a bitmap allocator.  NOT YET FIXED.  It may be possible to turn
-   off DYNAMIC_LOADING in the collector as a workaround.  It may also
-   be possible to conditionally intercept mmap and use GC_exclude_static_roots.
-   The real fix is to walk rld data structures, which looks possible.
- - Incremental collector should handle large objects better.  Currently,
-   it looks like the whole object is treated as dirty if any part of it
-   is.
- 
diff --git a/boehm-gc/doc/README.contributors b/boehm-gc/doc/README.contributors
deleted file mode 100644
index fd5c95f2297..00000000000
--- a/boehm-gc/doc/README.contributors
+++ /dev/null
@@ -1,57 +0,0 @@
-This is an attempt to acknowledge early contributions to the garbage
-collector.  Later contributions should instead be mentioned in
-README.changes.
-
-HISTORY -
-
-  Early versions of this collector were developed as a part of research
-projects supported in part by the National Science Foundation
-and the Defense Advance Research Projects Agency.
-
-The garbage collector originated as part of the run-time system for
-the Russell programming language implementation. The first version of the
-garbage collector was written primarily by Al Demers.  It was then refined
-and mostly rewritten, primarily by Hans-J. Boehm, at Cornell U., 
-the University of Washington, Rice University (where it was first used for
-C and assembly code), Xerox PARC, SGI, and HP Labs.  However, significant
-contributions have also been made by many others.
-
-Some other contributors:  
-
-More recent contributors are mentioned in the modification history in
-README.changes.  My apologies for any omissions.
-
-The SPARC specific code was originally contributed by Mark Weiser.
-The Encore Multimax modifications were supplied by
-Kevin Kenny (kenny@m.cs.uiuc.edu).  The adaptation to the IBM PC/RT is largely
-due to Vernon Lee, on machines made available to Rice by IBM.
-Much of the HP specific code and a number of good suggestions for improving the
-generic code are due to Walter Underwood.
-Robert Brazile (brazile@diamond.bbn.com) originally supplied the ULTRIX code.
-Al Dosser (dosser@src.dec.com) and Regis Cridlig (Regis.Cridlig@cl.cam.ac.uk)
-subsequently provided updates and information on variation between ULTRIX
-systems.  Parag Patel (parag@netcom.com) supplied the A/UX code.
-Jesper Peterson(jep@mtiame.mtia.oz.au), Michel Schinz, and
-Martin Tauchmann (martintauchmann@bigfoot.com) supplied the Amiga port.
-Thomas Funke (thf@zelator.in-berlin.de(?)) and
-Brian D.Carlstrom (bdc@clark.lcs.mit.edu) supplied the NeXT ports.
-Douglas Steel (doug@wg.icl.co.uk) provided ICL DRS6000 code.
-Bill Janssen (janssen@parc.xerox.com) supplied the SunOS dynamic loader
-specific code. Manuel Serrano (serrano@cornas.inria.fr) supplied linux and
-Sony News specific code.  Al Dosser provided Alpha/OSF/1 code.  He and
-Dave Detlefs(detlefs@src.dec.com) also provided several generic bug fixes.
-Alistair G. Crooks(agc@uts.amdahl.com) supplied the NetBSD and 386BSD ports.
-Jeffrey Hsu (hsu@soda.berkeley.edu) provided the FreeBSD port.
-Brent Benson (brent@jade.ssd.csd.harris.com) ported the collector to
-a Motorola 88K processor running CX/UX (Harris NightHawk).
-Ari Huttunen (Ari.Huttunen@hut.fi) generalized the OS/2 port to
-nonIBM development environments (a nontrivial task).
-Patrick Beard (beard@cs.ucdavis.edu) provided the initial MacOS port.
-David Chase, then at Olivetti Research, suggested several improvements.
-Scott Schwartz (schwartz@groucho.cse.psu.edu) supplied some of the
-code to save and print call stacks for leak detection on a SPARC.
-Jesse Hull and John Ellis supplied the C++ interface code.
-Zhong Shao performed much of the experimentation that led to the
-current typed allocation facility.  (His dynamic type inference code hasn't
-made it into the released version of the collector, yet.)
-
diff --git a/boehm-gc/doc/README.cords b/boehm-gc/doc/README.cords
deleted file mode 100644
index 3485e0145af..00000000000
--- a/boehm-gc/doc/README.cords
+++ /dev/null
@@ -1,53 +0,0 @@
-Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
-
-THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-
-Permission is hereby granted to use or copy this program
-for any purpose,  provided the above notices are retained on all copies.
-Permission to modify the code and to distribute modified code is granted,
-provided the above notices are retained, and a notice that the code was
-modified is included with the above copyright notice.
-
-Please send bug reports to Hans-J. Boehm (Hans_Boehm@hp.com or
-boehm@acm.org).
-
-This is a string packages that uses a tree-based representation.
-See cord.h for a description of the functions provided.  Ec.h describes
-"extensible cords", which are essentially output streams that write
-to a cord.  These allow for efficient construction of cords without
-requiring a bound on the size of a cord.
-
-More details on the data structure can be found in
-
-Boehm, Atkinson, and Plass, "Ropes: An Alternative to Strings",
-Software Practice and Experience 25, 12, December 1995, pp. 1315-1330.
-
-A fundamentally similar "rope" data structure is also part of SGI's standard
-template library implementation, and its descendents, which include the
-GNU C++ library.  That uses reference counting by default.
-There is a short description of that data structure at
-http://reality.sgi.com/boehm/ropeimpl.html .  (The more official location
-http://www.sgi.com/tech/stl/ropeimpl.html is missing a figure.)
-
-All of these are descendents of the "ropes" in Xerox Cedar.
-
-de.c is a very dumb text editor that illustrates the use of cords.
-It maintains a list of file versions.  Each version is simply a
-cord representing the file contents.  Nonetheless, standard
-editing operations are efficient, even on very large files.
-(Its 3 line "user manual" can be obtained by invoking it without
-arguments.  Note that ^R^N and ^R^P move the cursor by
-almost a screen.  It does not understand tabs, which will show
-up as highlighred "I"s.  Use the UNIX "expand" program first.)
-To build the editor, type "make cord/de" in the gc directory.
-
-This package assumes an ANSI C compiler such as gcc.  It will
-not compile with an old-style K&R compiler.
-
-Note that CORD_printf iand friends use C functions with variable numbers
-of arguments in non-standard-conforming ways.  This code is known to
-break on some platforms, notably PowerPC.  It should be possible to
-build the remainder of the library (everything but cordprnt.c) on
-any platform that supports the collector.
- 
diff --git a/boehm-gc/doc/README.darwin b/boehm-gc/doc/README.darwin
deleted file mode 100644
index 70954971fc0..00000000000
--- a/boehm-gc/doc/README.darwin
+++ /dev/null
@@ -1,141 +0,0 @@
-6.5 update:
-I disabled incremental GC on Darwin in this version, since I couldn't
-get gctest to pass when the GC was built as a dynamic library.  Building
-with -DMPROTECT_VDB (and threads) on the command line should get you
-back to the old state.			- HB
-
-./configure --enable-cplusplus results in a "make check" failure, probably
-because the ::delete override ends up in a separate dl, and Darwin dynamic
-loader semantics appear to be such that this is not really visible to the
-main program, unlike on ELF systems.  Someone who understands dynamic
-loading needs to lookat this.  For now, gc_cpp.o needs to be linked
-statically, if needed.			- HB
-
-Darwin/MacOSX Support - December 16, 2003
-=========================================
-
-Important Usage Notes
-=====================
-
-GC_init() MUST be called before calling any other GC functions. This 
-is necessary to properly register segments in dynamic libraries. This
-call is required even if you code does not use dynamic libraries as the
-dyld code handles registering all data segments.
-
-When your use of the garbage collector is confined to dylibs and you
-cannot call GC_init() before your libraries' static initializers have
-run and perhaps called GC_malloc(), create an initialization routine
-for each library to call GC_init():
-
-#include <gc/gc.h>
-extern "C" void my_library_init() { GC_init(); }
-
-Compile this code into a my_library_init.o, and link it into your
-dylib. When you link the dylib, pass the -init argument with
-_my_library_init (e.g. gcc -dynamiclib -o my_library.dylib a.o b.o c.o
-my_library_init.o -init _my_library_init). This causes
-my_library_init() to be called before any static initializers, and
-will initialize the garbage collector properly. 
-
-Note: It doesn't hurt to call GC_init() more than once, so it's best,
-if you have an application or set of libraries that all use the
-garbage collector, to create an initialization routine for each of
-them that calls GC_init(). Better safe than sorry. 
-
-The incremental collector is still a bit flaky on darwin. It seems to 
-work reliably with workarounds for a few possible bugs in place however
-these workaround may not work correctly in all cases. There may also
-be additional problems that I have not found. 
-
-Thread-local GC allocation will not work with threads that are not
-created using the GC-provided override of pthread_create(). Threads
-created without the GC-provided pthread_create() do not have the
-necessary data structures in the GC to store this data. 
-
-
-Implementation Information
-==========================
-Darwin/MacOSX support is nearly complete. Thread support is reliable on 
-Darwin 6.x (MacOSX 10.2) and there have been reports of success on older
-Darwin versions (MacOSX 10.1). Shared library support had also been
-added and the gc can be run from a shared library. There is currently only
-support for Darwin/PPC although adding x86 support should be trivial.
-
-Thread support is implemented in terms of mach thread_suspend and
-thread_resume calls. These provide a very clean interface to thread
-suspension. This implementation doesn't rely on pthread_kill so the
-code works on Darwin < 6.0 (MacOSX 10.1). All the code to stop and
-start the world is located in darwin_stop_world.c.
-
-Since not all uses of the GC enable clients to override pthread_create()
-before threads have been created, the code for stopping the world has
-been rewritten to look for threads using Mach kernel calls. Each
-thread identified in this way is suspended and resumed as above. In
-addition, since Mach kernel threads do not contain pointers to their
-stacks, a stack-walking function has been written to find the stack
-limits. Given an initial stack pointer (for the current thread, a
-pointer to a stack-allocated local variable will do; for a non-active
-thread, we grab the value of register 1 (on PowerPC)), it
-will walk the PPC Mach-O-ABI compliant stack chain until it reaches the
-top of the stack. This appears to work correctly for GCC-compiled C,
-C++, Objective-C, and Objective-C++ code, as well as for Java
-programs that use JNI. If you run code that does not follow the stack
-layout or stack pointer conventions laid out in the PPC Mach-O ABI,
-then this will likely crash the garbage collector. 
-
-The original incremental collector support unfortunatelly no longer works
-on recent Darwin versions. It also relied on some undocumented kernel
-structures. Mach, however, does have a very clean interface to exception
-handing. The current implementation uses Mach's exception handling. 
-
-Much thanks goes to Andrew Stone, Dietmar Planitzer, Andrew Begel, 
-Jeff Sturm, and Jesse Rosenstock for all their work on the 
-Darwin/OS X port.
-
--Brian Alliet
-brian@brianweb.net
-
-
-Older Information (Most of this no longer applies to the current code)
-======================================================================
-
-While the GC should work on MacOS X Server, MacOS X and Darwin, I only tested
-it on MacOS X Server.
-I've added a PPC assembly version of GC_push_regs(), thus the setjmp() hack is
-no longer necessary. Incremental collection is supported via mprotect/signal.
-The current solution isn't really optimal because the signal handler must decode
-the faulting PPC machine instruction in order to find the correct heap address.
-Further, it must poke around in the register state which the kernel saved away
-in some obscure register state structure before it calls the signal handler -
-needless to say the layout of this structure is no where documented.
-Threads and dynamic libraries are not yet supported (adding dynamic library
-support via the low-level dyld API shouldn't be that hard).
-
-The original MacOS X port was brought to you by Andrew Stone.
-
-
-June, 1 2000
-
-Dietmar Planitzer
-dave.pl@ping.at
-
-Note from Andrew Begel:
-
-One more fix to enable gc.a to link successfully into a shared library for
-MacOS X. You have to add -fno-common to the CFLAGS in the Makefile. MacOSX
-disallows common symbols in anything that eventually finds its way into a
-shared library. (I don't completely understand why, but -fno-common seems to
-work and doesn't mess up the garbage collector's functionality).
-
-Feb 26, 2003
-
-Jeff Sturm and Jesse Rosenstock provided a patch that adds thread support.
-GC_MACOSX_THREADS should be defined in the build and in clients.  Real
-dynamic library support is still missing, i.e. dynamic library data segments
-are still not scanned.  Code that stores pointers to the garbage collected
-heap in statically allocated variables should not reside in a dynamic
-library.  This still doesn't appear to be 100% reliable.  
-
-Mar 10, 2003
-Brian Alliet contributed dynamic library support for MacOSX.  It could also
-use more testing.
diff --git a/boehm-gc/doc/README.dj b/boehm-gc/doc/README.dj
deleted file mode 100644
index 613bc423cb1..00000000000
--- a/boehm-gc/doc/README.dj
+++ /dev/null
@@ -1,12 +0,0 @@
-[Original version supplied by Xiaokun Zhu <xiaokun@aero.gla.ac.uk>]
-[This version came mostly from Gary Leavens.			  ]
-
-Look first at Makefile.dj, and possibly change the definitions of
-RM and MV if you don't have rm and mv installed.
-Then use Makefile.dj to compile the garbage collector.
-For example, you can do:
-
-	make -f Makefile.dj test
-
-All the tests should work fine.
-
diff --git a/boehm-gc/doc/README.environment b/boehm-gc/doc/README.environment
deleted file mode 100644
index 686e948250b..00000000000
--- a/boehm-gc/doc/README.environment
+++ /dev/null
@@ -1,151 +0,0 @@
-The garbage collector looks at a number of environment variables which are
-then used to affect its operation.  These are examined only on Un*x-like
-platforms and win32.
-
-GC_INITIAL_HEAP_SIZE=<bytes> -	Initial heap size in bytes.  May speed up
-				process start-up.
-
-GC_MAXIMUM_HEAP_SIZE=<bytes> - Maximum collected heap size.
-
-GC_LOOP_ON_ABORT - Causes the collector abort routine to enter a tight loop.
-		   This may make it easier to debug, such a process, especially
-		   for multithreaded platforms that don't produce usable core
-		   files, or if a core file would be too large.  On some
-		   platforms, this also causes SIGSEGV to be caught and
-		   result in an infinite loop in a handler, allowing
-		   similar debugging techniques.
-
-GC_PRINT_STATS - Turn on as much logging as is easily feasible without
-		 adding signifcant runtime overhead.  Doesn't work if
-		 the collector is built with SMALL_CONFIG.  Overridden
-		 by setting GC_quiet.  On by default if the collector
-		 was built without -DSILENT.
-
-GC_DUMP_REGULARLY - Generate a GC debugging dump GC_dump() on startup
-		    and during every collection.  Very verbose.  Useful
-		    if you have a bug to report, but please include only the
-		    last complete dump.
-
-GC_BACKTRACES=<n> - Generate n random backtraces (for heap profiling) after
-		    each GC.  Collector must have been built with
-		    KEEP_BACK_PTRS.  This won't generate useful output unless
-		    most objects in the heap were allocated through debug
-		    allocators.  This is intended to be only a statistical
-		    sample;  individual traces may be erroneous due to
-		    concurrent heap mutation.
-
-GC_PRINT_ADDRESS_MAP - Linux only.  Dump /proc/self/maps, i.e. various address
-		       maps for the process, to stderr on every GC.  Useful for
-		       mapping root addresses to source for deciphering leak
-		       reports.
-
-GC_NPROCS=<n> - Linux w/threads only.  Explicitly sets the number of processors
-	        that the GC should expect to use.  Note that setting this to 1
-		when multiple processors are available will preserve
-		correctness, but may lead to really horrible performance,
-		since the lock implementation will immediately yield without
-		first spinning.
-
-GC_MARKERS=<n> - Linux w/threads and parallel marker only.  Set the number
-		of marker threads.  This is normaly set to the number of
-		processors.  It is safer to adjust GC_MARKERS than GC_NPROCS,
-		since GC_MARKERS has no impact on the lock implementation.
-
-GC_NO_BLACKLIST_WARNING - Prevents the collector from issuing
-		warnings about allocations of very large blocks.
-		Deprecated.  Use GC_LARGE_ALLOC_WARN_INTERVAL instead.
-
-GC_LARGE_ALLOC_WARN_INTERVAL=<n> - Print every nth warning about very large
-		block allocations, starting with the nth one.  Small values
-		of n are generally benign, in that a bounded number of
-		such warnings generally indicate at most a bounded leak.
-		For best results it should be set at 1 during testing.
-		Default is 5.  Very large numbers effectively disable the
-		warning.
-
-GC_IGNORE_GCJ_INFO - Ignore the type descriptors implicitly supplied by
-		     GC_gcj_malloc and friends.  This is useful for debugging
-		     descriptor generation problems, and possibly for
-		     temporarily working around such problems.  It forces a
-		     fully conservative scan of all heap objects except
-		     those known to be pointerfree, and may thus have other
-		     adverse effects.
-
-GC_PRINT_BACK_HEIGHT - Print max length of chain through unreachable objects
-		     ending in a reachable one.  If this number remains
-		     bounded, then the program is "GC robust".  This ensures
-		     that a fixed number of misidentified pointers can only
-		     result in a bounded space leak.  This currently only
-		     works if debugging allocation is used throughout.
-		     It increases GC space and time requirements appreciably.
-		     This feature is still somewhat experimental, and requires
-		     that the collector have been built with MAKE_BACK_GRAPH
-		     defined.  For details, see Boehm, "Bounding Space Usage
-		     of Conservative Garbage Collectors", POPL 2001, or
-		     http://lib.hpl.hp.com/techpubs/2001/HPL-2001-251.html .
-
-GC_RETRY_SIGNALS, GC_NO_RETRY_SIGNALS - Try to compensate for lost
-		     thread suspend signals in linux_threads.c.  On by
-		     default for GC_OSF1_THREADS, off otherwise.  Note 
-		     that this does not work around a possible loss of
-		     thread restart signals.  This seems to be necessary for
-		     some versions of Tru64.  Since we've previously seen
-		     similar issues on some other operating systems, it
-		     was turned into a runtime flag to enable last-minute
-		     work-arounds.
-
-GC_IGNORE_FB[=<n>] -  (Win32 only.) Try to avoid treating a mapped
-		frame buffer as part of the root set.  Certain (higher end?)
-		graphics cards seems to result in the graphics memory mapped
-		into the user address space as writable memory.
-		Unfortunately, there seems to be no systematic way to
-		identify such memory.  Setting the environment variable to n
-		causes the collector to ignore mappings longer than n MB.
-		The default value of n is currently 15.  (This should cover
-		a 16 MB graphics card, since the mapping appears to be slightly
-		shorter than all of graphics memory.  It will fail if a dll
-		writes pointers to collectable objects into a data segment
-		whose length is >= 15MB.  Empirically that's rare, but
-		certainly possible.)  WARNING: Security sensitive applications
-		should probably disable this feature by setting
-		GC_disallow_ignore_fb, or by building with -DNO_GETENV,
-		since small values could force collection of reachable
-		objects, which is conceivably a	(difficult to exploit)
-		security hole.  GC_IGNORE_FB values less than 3 MB
-		are never honored, eliminating this risk for most,
-		but not all, applications.  This feature is likely to disappear
-		if/when we find a less disgusting "solution".
-		IN VERSION 6.4 AND LATER, THIS SHOULD BE UNNECESSARY.
-
-The following turn on runtime flags that are also program settable.  Checked
-only during initialization.  We expect that they will usually be set through
-other means, but this may help with debugging and testing:
-
-GC_ENABLE_INCREMENTAL - Turn on incremental collection at startup.  Note that,
-		     depending on platform and collector configuration, this
-		     may involve write protecting pieces of the heap to
-		     track modifications.  These pieces may include pointerfree
-		     objects or not.  Although this is intended to be
-		     transparent, it may cause unintended system call failures.
-		     Use with caution.
-
-GC_PAUSE_TIME_TARGET - Set the desired garbage collector pause time in msecs.
-		     This only has an effect if incremental collection is
-		     enabled.  If a collection requires appreciably more time
-		     than this, the client will be restarted, and the collector
-		     will need to do additional work to compensate.  The
-		     special value "999999" indicates that pause time is
-		     unlimited, and the incremental collector will behave
-		     completely like a simple generational collector.  If
-		     the collector is configured for parallel marking, and
-		     run on a multiprocessor, incremental collection should
-		     only be used with unlimited pause time.
-
-GC_FIND_LEAK - Turns on GC_find_leak and thus leak detection.  Forces a
-	       collection at program termination to detect leaks that would
-	       otherwise occur after the last GC.
-
-GC_ALL_INTERIOR_POINTERS - Turns on GC_all_interior_pointers and thus interior
-			   pointer recognition.
-
-GC_DONT_GC - Turns off garbage collection.  Use cautiously.
diff --git a/boehm-gc/doc/README.ews4800 b/boehm-gc/doc/README.ews4800
deleted file mode 100644
index 80bca2b3d95..00000000000
--- a/boehm-gc/doc/README.ews4800
+++ /dev/null
@@ -1,81 +0,0 @@
-GC on EWS4800
--------------
-
-1. About EWS4800
-   EWS4800 is 32bit/64bit workstation.
-
-     Vender: NEC Corporation
-     OS: UX/4800 R9.* - R13.* (SystemV R4.2)
-     CPU: R4000, R4400, R10000 (MIPS)
-
-2. Compiler
-
- 32bit:
-   Use ANSI C compiler.
-     CC = /usr/abiccs/bin/cc
-
- 64bit:
-   Use 64bit ANSI C compiler.
-     CC = /usr/ccs64/bin/cc
-     AR = /usr/ccs64/bin/ar
-
-3. ELF file format
-   *** Caution: The following infomation is empirical. ***
-
- 32bit:
-   ELF file has an unique format. (See a.out(4) and end(3C).)
-
-     &_start
-        :      text segment
-     &etext
-     DATASTART
-        :      data segment (initialized)
-     &edata
-     DATASTART2
-        :      data segment (uninitialized)
-     &end
-
-   Here, DATASTART and DATASTART2 are macros of GC, and are defined as
-   the following equations. (See include/private/gcconfig.h.)
-   The algorithm for DATASTART is similar with the function
-   GC_SysVGetDataStart() in os_dep.c.
-
-     DATASTART  = ((&etext + 0x3ffff) & ~0x3ffff) + (&etext & 0xffff)
-
-    Dynamically linked:
-     DATASTART2 = (&_gp + 0x8000 + 0x3ffff) & ~0x3ffff
-
-    Statically linked:
-     DATASTART2 = &edata
-
-   GC has to check addresses both between DATASTART and &edata, and
-   between DATASTART2 and &end. If a program accesses between &etext
-   and DATASTART, or between &edata and DATASTART2, the segmentation
-   error occurs and the program stops.
-
-   If a program is statically linked, there is not a gap between
-   &edata and DATASTART2. The global symbol &_DYNAMIC_LINKING is used
-   for the detection.
-
- 64bit:
-   ELF file has a simple format. (See end(3C).)
-
-     _ftext
-        :      text segment
-     _etext
-     _fdata = DATASTART
-        :      data segment (initialized)
-     _edata
-     _fbss
-        :      data segment (uninitialized)
-     _end = DATAEND
-
---
-Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
-
-
-When using the new "configure; make" build process, please
-run configure with the --disable-shared option.  "Make check" does not
-yet pass with dynamic libraries.  Ther reasons for that are not yet
-understood.  (HB, paraphrasing message from Hironori SAKAMOTO.)
-
diff --git a/boehm-gc/doc/README.hp b/boehm-gc/doc/README.hp
deleted file mode 100644
index caa8bdd19f5..00000000000
--- a/boehm-gc/doc/README.hp
+++ /dev/null
@@ -1,18 +0,0 @@
-Dynamic loading support requires that executables be linked with -ldld.
-The alternative is to build the collector without defining DYNAMIC_LOADING
-in gcconfig.h and ensuring that all garbage collectable objects are
-accessible without considering statically allocated variables in dynamic
-libraries.
-
-The collector should compile with either plain cc or cc -Ae.  Cc -Aa
-fails to define _HPUX_SOURCE and thus will not configure the collector
-correctly.
-
-Incremental collection support was reccently added, and should now work.
-
-In spite of past claims, pthread support under HP/UX 11 should now work.
-Define GC_HPUX_THREADS for the build.  Incremental collection still does not
-work in combination with it.
-
-The stack finding code can be confused by putenv calls before collector
-initialization.  Call GC_malloc or GC_init before any putenv calls.
diff --git a/boehm-gc/doc/README.linux b/boehm-gc/doc/README.linux
deleted file mode 100644
index ec4e7e641a0..00000000000
--- a/boehm-gc/doc/README.linux
+++ /dev/null
@@ -1,132 +0,0 @@
-See README.alpha for Linux on DEC AXP info.
-
-This file applies mostly to Linux/Intel IA32.  Ports to Linux on an M68K, IA64,
-SPARC, MIPS, Alpha and PowerPC are also integrated.  They should behave
-similarly, except that the PowerPC port lacks incremental GC support, and
-it is unknown to what extent the Linux threads code is functional.
-See below for M68K specific notes.
-
-Incremental GC is generally supported.
-
-Dynamic libraries are supported on an ELF system.  A static executable
-should be linked with the gcc option "-Wl,-defsym,_DYNAMIC=0".
-
-The collector appears to work reliably with Linux threads, but beware 
-of older versions of glibc and gdb.
-
-The garbage collector uses SIGPWR and SIGXCPU if it is used with
-Linux threads.  These should not be touched by the client program.
-
-To use threads, you need to abide by the following requirements:
-
-1) You need to use LinuxThreads or NPTL (which are included in libc6).
-
-   The collector relies on some implementation details of the LinuxThreads
-   package.  This code may not work on other
-   pthread implementations (in particular it will *not* work with
-   MIT pthreads).
-
-2) You must compile the collector with -DGC_LINUX_THREADS and -D_REENTRANT
-   specified in the Makefile.
-
-3a) Every file that makes thread calls should define GC_LINUX_THREADS and 
-   _REENTRANT and then include gc.h.  Gc.h redefines some of the
-   pthread primitives as macros which also provide the collector with
-   information it requires.
-
-3b) A new alternative to (3a) is to build the collector and compile GC clients
-   with -DGC_USE_LD_WRAP, and to link the final program with
-
-   (for ld) --wrap read --wrap dlopen --wrap pthread_create \
-	    --wrap pthread_join --wrap pthread_detach \
-	    --wrap pthread_sigmask --wrap sleep
-
-   (for gcc) -Wl,--wrap -Wl,read -Wl,--wrap -Wl,dlopen -Wl,--wrap \
-	     -Wl,pthread_create -Wl,--wrap -Wl,pthread_join -Wl,--wrap \
-	     -Wl,pthread_detach -Wl,--wrap -Wl,pthread_sigmask \
-	     -Wl,--wrap -Wl,sleep
-
-   In any case, _REENTRANT should be defined during compilation.
-
-4) Dlopen() disables collection during its execution.  (It can't run
-   concurrently with the collector, since the collector looks at its
-   data structures.  It can't acquire the allocator lock, since arbitrary
-   user startup code may run as part of dlopen().)  Under unusual
-   conditions, this may cause unexpected heap growth.
-
-5) The combination of GC_LINUX_THREADS, REDIRECT_MALLOC, and incremental
-   collection fails in seemingly random places.  This hasn't been tracked
-   down yet, but is perhaps not completely astonishing.  The thread package
-   uses malloc, and thus can presumably get SIGSEGVs while inside the
-   package.  There is no real guarantee that signals are handled properly
-   at that point.
-
-6) Thread local storage may not be viewed as part of the root set by the
-   collector.  This probably depends on the linuxthreads version.  For the
-   time being, any collectable memory referenced by thread local storage should
-   also be referenced from elsewhere, or be allocated as uncollectable.
-   (This is really a bug that should be fixed somehow.)
-
-
-M68K LINUX:
-(From Richard Zidlicky)
-The bad news is that it can crash every linux-m68k kernel on a 68040,
-so an additional test is needed somewhere on startup. I have meanwhile
-patches to correct the problem in 68040 buserror handler but it is not
-yet in any standard kernel.
-
-Here is a simple test program to detect whether the kernel has the
-problem. It could be run as a separate check in configure or tested 
-upon startup. If it fails (return !0) than mprotect can't be used
-on that system.
-
-/*
- * test for bug that may crash 68040 based Linux
- */
-
-#include <sys/mman.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-char *membase;
-int pagesize=4096;
-int pageshift=12;
-int x_taken=0;
-
-int sighandler(int sig)
-{
-   mprotect(membase,pagesize,PROT_READ|PROT_WRITE);
-   x_taken=1;
-}
-
-main()
-{
-  long l;
-
-   signal(SIGSEGV,sighandler);
-   l=(long)mmap(NULL,pagesize,PROT_READ,MAP_PRIVATE | MAP_ANON,-1,0);
-  if (l==-1)
-     {
-       perror("mmap/malloc");
-       abort();
-     }
-  membase=(char*)l;
-    *(long*)(membase+sizeof(long))=123456789;
-  if (*(long*)(membase+sizeof(long)) != 123456789 )
-    {
-      fprintf(stderr,"writeback failed !\n");
-      exit(1);
-    }
-  if (!x_taken)
-    {
-      fprintf(stderr,"exception not taken !\n");
-      exit(1);
-    }
-  fprintf(stderr,"vmtest Ok\n");
-  exit(0);
-}
-
-
diff --git a/boehm-gc/doc/README.macros b/boehm-gc/doc/README.macros
deleted file mode 100644
index df0ef2cda93..00000000000
--- a/boehm-gc/doc/README.macros
+++ /dev/null
@@ -1,94 +0,0 @@
-The collector uses a large amount of conditional compilation in order to
-deal with platform dependencies.  This violates a number of known coding
-standards.  On the other hand, it seems to be the only practical way to
-support this many platforms without excessive code duplication. 
-
-A few guidelines have mostly been followed in order to keep this manageable:
-
-1) #if and #ifdef directives are properly indented whenever easily possible.
-All known C compilers allow whitespace between the "#" and the "if" to make
-this possible.  ANSI C also allows white space before the "#", though we
-avoid that.  It has the known disadvantages that it differs from the normal
-GNU conventions, and that it makes patches larger than otherwise necessary.
-In my opinion, it's still well worth it, for the same reason that we indent
-ordinary "if" statements.
-
-2) Whenever possible, tests are performed on the macros defined in gcconfig.h
-instead of directly testing patform-specific predefined macros.  This makes it
-relatively easy to adapt to new compilers with a different set of predefined
-macros.  Currently these macros generally identify platforms instead of
-features.  In many cases, this is a mistake.
-
-3) The code currently avoids #elif, eventhough that would make it more
-readable.  This was done since #elif would need to be understood by ALL
-compilers used to build the collector, and that hasn't always been the case.
-It makes sense to reconsider this decision at some point, since #elif has been
-standardized at least since 1989.
-
-Many of the tested configuration macros are at least somewhat defined in
-either include/private/gcconfig.h or in Makefile.direct.  Here is an attempt
-at defining some of the remainder:  (Thanks to Walter Bright for suggesting
-this.  This is a work in progress)
-
-MACRO		EXPLANATION
------		-----------
-
-__DMC__	Always #define'd by the Digital Mars compiler. Expands
-		to the compiler version number in hex, i.e. 0x810 is
-		version 8.1b0
-
-_ENABLE_ARRAYNEW
-		#define'd by the Digital Mars C++ compiler when
-		operator new[] and delete[] are separately
-		overloadable. Used in gc_cpp.h.
-
-_MSC_VER	Expands to the Visual C++ compiler version.  Assumed to
-		not be defined for other compilers (at least if they behave
-		appreciably differently).
-
-_DLL		Defined by Visual C++ if dynamic libraries are being built
-		or used.  Used to test whether __declspec(dllimport) or
-		__declspec(dllexport) needs to be added to declarations
-		to support the case in which the collector is in a dll.
-
-GC_DLL		User-settable macro that forces the effect of _DLL.  Set
-		by gc.h if _DLL is defined and GC_NOT_DLL is undefined.
-		This is the macro that is tested internally to determine
-		whether the GC is in its own dynamic library.  May need
-		to be set by clients before including gc.h.  Note that
-		inside the GC implementation it indicates that the
-		collector is in its own dynamic library, should export
-		its symbols, etc.  But in clients it indicates that the
-		GC resides in a different DLL, its entry points should
-		be referenced accordingly, and precautions may need to
-		be taken to properly deal with statically allocated 
-		variables in the main program.  Used only for MS Windows.
-
-GC_NOT_DLL	User-settable macro that overrides _DLL, e.g. if dynamic
-		libraries are used, but the collector is in a static library.
-
-__STDC__	Assumed to be defined only by compilers that understand
-		prototypes and other C89 features.  Its value is generally
-		not used, since we are fine with most nonconforming extensions.
-
-SUNOS5SIGS	Solaris-like signal handling.  This is probably misnamed,
-		since it really doesn't guarantee much more than Posix.
-		Currently set only for Solaris2.X, HPUX, and DRSNX.  Should
-		probably be set for some other platforms.
-
-PCR		Set if the collector is being built as part of the Xerox
-		Portable Common Runtime.
-
-SRC_M3		Set if the collector is being built as a replacement of the
-		one in the DEC/Compaq SRC Modula-3 runtime.  I suspect this
-		was last used around 1994, and no doubt broke a long time ago.
-		It's there primarily incase someone wants to port to a similar
-		system.
-
-USE_COMPILER_TLS  Assume the existence of __thread-style thread-local
-		storage.  Set automatically for thread-local allocation with
-		the HP/UX vendor compiler.  Usable with gcc on sufficiently
-		up-to-date ELF platforms.
-
-
-
diff --git a/boehm-gc/doc/README.rs6000 b/boehm-gc/doc/README.rs6000
deleted file mode 100644
index f5630b20a32..00000000000
--- a/boehm-gc/doc/README.rs6000
+++ /dev/null
@@ -1,9 +0,0 @@
-We have so far failed to find a good way to determine the stack base.
-It is highly recommended that GC_stackbottom be set explicitly on program
-startup.  The supplied value sometimes causes failure under AIX 4.1, though
-it appears to work under 3.X.  HEURISTIC2 seems to work under 4.1, but
-involves a substantial performance penalty, and will fail if there is
-no limit on stack size.
-
-There is no thread support.  (I assume recent versions of AIX provide
-pthreads?  I no longer have access to a machine ...)
diff --git a/boehm-gc/doc/README.sgi b/boehm-gc/doc/README.sgi
deleted file mode 100644
index 7bdb50a4ef9..00000000000
--- a/boehm-gc/doc/README.sgi
+++ /dev/null
@@ -1,41 +0,0 @@
-Performance of the incremental collector can be greatly enhanced with
--DNO_EXECUTE_PERMISSION.
-
-The collector should run with all of the -32, -n32 and -64 ABIs.  Remember to
-define the AS macro in the Makefile to be "as -64", or "as -n32".
-
-If you use -DREDIRECT_MALLOC=GC_malloc with C++ code, your code should make
-at least one explicit call to malloc instead of new to ensure that the proper
-version of malloc is linked in.
-
-Sproc threads are not supported in this version, though there may exist other
-ports.
-
-Pthreads support is provided.  This requires that:
-
-1) You compile the collector with -DGC_IRIX_THREADS specified in the Makefile.
-
-2) You have the latest pthreads patches installed.  
-
-(Though the collector makes only documented pthread calls,
-it relies on signal/threads interactions working just right in ways
-that are not required by the standard.  It is unlikely that this code
-will run on other pthreads platforms.  But please tell me if it does.)
-
-3) Every file that makes thread calls should define IRIX_THREADS and then
-include gc.h.  Gc.h redefines some of the pthread primitives as macros which
-also provide the collector with information it requires.
-
-4) pthread_cond_wait and pthread_cond_timed_wait should be prepared for
-premature wakeups.  (I believe the pthreads and realted standards require this
-anyway.  Irix pthreads often terminate a wait if a signal arrives.
-The garbage collector uses signals to stop threads.)
-
-5) It is expensive to stop a thread waiting in IO at the time the request is
-initiated.  Applications with many such threads may not exhibit acceptable
-performance with the collector.  (Increasing the heap size may help.)
-
-6) The collector should not be compiled with -DREDIRECT_MALLOC.  This
-confuses some library calls made by the pthreads implementation, which
-expect the standard malloc.
-
diff --git a/boehm-gc/doc/README.solaris2 b/boehm-gc/doc/README.solaris2
deleted file mode 100644
index 31e7500382d..00000000000
--- a/boehm-gc/doc/README.solaris2
+++ /dev/null
@@ -1,60 +0,0 @@
-The collector supports both incremental collection and threads under
-Solaris 2.  The incremental collector normally retrieves page dirty information
-through the appropriate /proc calls.  But it can also be configured
-(by defining MPROTECT_VDB instead of PROC_VDB in gcconfig.h) to use mprotect
-and signals.  This may result in shorter pause times, but it is no longer
-safe to issue arbitrary system calls that write to the heap.
-
-Under other UNIX versions,
-the collector normally obtains memory through sbrk.  There is some reason
-to expect that this is not safe if the client program also calls the system
-malloc, or especially realloc.  The sbrk man page strongly suggests this is
-not safe: "Many library routines use malloc() internally, so use brk()
-and sbrk() only when you know  that malloc() definitely will not be used by
-any library routine."  This doesn't make a lot of sense to me, since there
-seems to be no documentation as to which routines can transitively call malloc.
-Nonetheless, under Solaris2, the collector now (since 4.12) allocates
-memory using mmap by default.  (It defines USE_MMAP in gcconfig.h.)
-You may want to reverse this decisions if you use -DREDIRECT_MALLOC=...
-
-
-SOLARIS THREADS:
-
-The collector must be compiled with -DGC_SOLARIS_THREADS (thr_ functions)
-or -DGC_SOLARIS_PTHREADS (pthread_ functions) to be thread safe.
-It is also essential that gc.h be included in files that call thr_create,
-thr_join, thr_suspend, thr_continue, or dlopen.  Gc.h macro defines
-these to also do GC bookkeeping, etc.  Gc.h must be included with
-one or both of these macros defined, otherwise
-these replacements are not visible.
-A collector built in this way way only be used by programs that are
-linked with the threads library.
-
-In this mode, the collector contains various workarounds for older Solaris
-bugs.  Mostly, these should not be noticeable unless you look at system
-call traces.  However, it cannot protect a guard page at the end of
-a thread stack.  If you know that you will only be running Solaris2.5
-or later, it should be possible to fix this by compiling the collector
-with -DSOLARIS23_MPROTECT_BUG_FIXED.
-
-Since 5.0 alpha5, dlopen disables collection temporarily,
-unless USE_PROC_FOR_LIBRARIES is defined.  In some unlikely cases, this
-can result in unpleasant heap growth.  But it seems better than the
-race/deadlock issues we had before.
-
-If solaris_threads are used on an X86 processor with malloc redirected to
-GC_malloc a deadlock is likely to result.
-
-It appears that there is a problem in using gc_cpp.h in conjunction with
-Solaris threads and Sun's C++ runtime.  Apparently the overloaded new operator
-is invoked by some iostream initialization code before threads are correctly
-initialized.  As a result, call to thr_self() in garbage collector
-initialization  segfaults.  Currently the only known workaround is to not
-invoke the garbage collector from a user defined global operator new, or to
-have it invoke the garbage-collector's allocators only after main has started.
-(Note that the latter requires a moderately expensive test in operator
-delete.)
-
-Hans-J. Boehm
-(The above contains my personal opinions, which are probably not shared
-by anyone else.)
diff --git a/boehm-gc/doc/README.uts b/boehm-gc/doc/README.uts
deleted file mode 100644
index 6be49667d7b..00000000000
--- a/boehm-gc/doc/README.uts
+++ /dev/null
@@ -1,2 +0,0 @@
-Alistair Crooks supplied the port.  He used Lexa C version 2.1.3 with
--Xa to compile.
diff --git a/boehm-gc/doc/README.win32 b/boehm-gc/doc/README.win32
deleted file mode 100644
index 6f57db11764..00000000000
--- a/boehm-gc/doc/README.win32
+++ /dev/null
@@ -1,215 +0,0 @@
-The collector has at various times been compiled under Windows 95 & later, NT,
-and XP, with the original Microsoft SDK, with Visual C++ 2.0, 4.0, and 6, with
-the GNU win32 tools, with Borland 4.5,  with Watcom C, and recently
-with the Digital Mars compiler.  It is likely that some of these have been
-broken in the meantime.  Patches are appreciated.
-
-For historical reasons,
-the collector test program "gctest" is linked as a GUI application,
-but does not open any windows.  Its output appears in the file
-"gc.log".  It may be started from the file manager.  The hour glass
-cursor may appear as long as it's running.  If it is started from the
-command line, it will usually run in the background.  Wait a few
-minutes (a few seconds on a modern machine) before you check the output.
-You should see either a failure indication or a "Collector appears to
-work" message.
-
-The cord test program has not been ported (but should port
-easily).  A toy editor (cord/de.exe) based on cords (heavyweight
-strings represented as trees) has been ported and is included.
-It runs fine under either win32 or win32S.  It serves as an example
-of a true Windows application, except that it was written by a
-nonexpert Windows programmer.  (There are some peculiarities
-in the way files are displayed.  The <cr> is displayed explicitly
-for standard DOS text files.  As in the UNIX version, control
-characters are displayed explicitly, but in this case as red text.
-This may be suboptimal for some tastes and/or sets of default
-window colors.)
-
-In general -DREDIRECT_MALLOC is unlikely to work unless the
-application is completely statically linked.
-
-The collector normally allocates memory from the OS with VirtualAlloc.
-This appears to cause problems under Windows NT and Windows 2000 (but
-not Windows 95/98) if the memory is later passed to CreateDIBitmap.
-To work around this problem, build the collector with -DUSE_GLOBAL_ALLOC.
-This is currently incompatible with -DUSE_MUNMAP.  (Thanks to Jonathan
-Clark for tracking this down.  There's some chance this may be fixed
-in 6.1alpha4, since we now separate heap sections with an unused page.)
-
-Microsoft Tools
----------------
-For Microsoft development tools, rename NT_MAKEFILE as
-MAKEFILE.  (Make sure that the CPU environment variable is defined
-to be i386.)  In order to use the gc_cpp.h C++ interface, all
-client code should include gc_cpp.h.
-
-For historical reasons,
-the collector test program "gctest" is linked as a GUI application,
-but does not open any windows.  Its output appears in the file
-"gc.log".  It may be started from the file manager.  The hour glass
-cursor may appear as long as it's running.  If it is started from the
-command line, it will usually run in the background.  Wait a few
-minutes (a few seconds on a modern machine) before you check the output.
-You should see either a failure indication or a "Collector appears to
-work" message.
-
-If you would prefer a VC++.NET project file, ask boehm@acm.org.  One has
-been contributed, but it seems to contain some absolute paths etc., so
-it can presumably only be a starting point, and is not in the standard
-distribution.  It is unclear (to me, Hans Boehm) whether it is feasible to
-change that.
-
-Clients may need to define GC_NOT_DLL before including gc.h, if the
-collector was built as a static library (as it normally is in the
-absence of thread support).
-
-GNU Tools
----------
-For GNU-win32, use the regular makefile, possibly after uncommenting
-the line "include Makefile.DLLs".  The latter should be necessary only
-if you want to package the collector as a DLL.
-[Is the following sentence obsolete? -HB] The GNU-win32 port is
-believed to work only for b18, not b19, probably due to linker changes
-in b19.  This is probably fixable with a different definition of
-DATASTART and DATAEND in gcconfig.h.
-
-The collector should also be buildable under Cygwin with either the
-old standard Makefile, or with the "configure;make" machinery.
-
-Borland Tools
--------------
-[Rarely tested.]
-For Borland tools, use BCC_MAKEFILE.  Note that
-Borland's compiler defaults to 1 byte alignment in structures (-a1),
-whereas Visual C++ appears to default to 8 byte alignment (/Zp8).
-The garbage collector in its default configuration EXPECTS AT
-LEAST 4 BYTE ALIGNMENT.  Thus the BORLAND DEFAULT MUST
-BE OVERRIDDEN.  (In my opinion, it should usually be anyway.
-I expect that -a1 introduces major performance penalties on a
-486 or Pentium.)  Note that this changes structure layouts.  (As a last
-resort, gcconfig.h can be changed to allow 1 byte alignment.  But
-this has significant negative performance implications.)
-The Makefile is set up to assume Borland 4.5.  If you have another
-version, change the line near the top.  By default, it does not
-require the assembler.  If you do have the assembler, I recommend
-removing the -DUSE_GENERIC.
-
-Incremental Collection
-----------------------
-There is some support for incremental collection.  This is
-currently pretty simple-minded.  Pages are protected.  Protection
-faults are caught by a handler installed at the bottom of the handler
-stack.  This is both slow and interacts poorly with a debugger.
-Whenever possible, I recommend adding a call to
-GC_enable_incremental at the last possible moment, after most
-debugging is complete.  Unlike the UNIX versions, no system
-calls are wrapped by the collector itself.  It may be necessary
-to wrap ReadFile calls that use a buffer in the heap, so that the
-call does not encounter a protection fault while it's running.
-(As usual, none of this is an issue unless GC_enable_incremental
-is called.)
-
-Note that incremental collection is disabled with -DSMALL_CONFIG.
-
-Threads
--------
-
-James Clark has contributed the necessary code to support win32 threads
-with the collector in a DLL.
-Use NT_THREADS_MAKEFILE (a.k.a gc.mak) instead of NT_MAKEFILE
-to build this version.  Note that this requires some files whose names
-are more than 8 + 3 characters long.  Thus you should unpack the tar file
-so that long file names are preserved.  To build the garbage collector
-test with VC++ from the command line, use
-
-nmake /F ".\gc.mak" CFG="gctest - Win32 Release"
-
-This requires that the subdirectory gctest\Release exist.
-The test program and DLL will reside in the Release directory.
-
-This version relies on the collector residing in a dll.
-
-This version currently supports incremental collection only if it is
-enabled before any additional threads are created.
-
-Since 6.3alpha2, threads are also better supported in static library builds
-with Microsoft tools (use NT_STATIC_THREADS_MAKEFILE) and with the GNU
-tools.  In all cases,the collector must be built with GC_WIN32_THREADS
-defined, even if the Cygwin pthreads interface is used.
-(NT_STATIC_THREADS_MAKEFILE does this implicitly.  Under Cygwin,
-./configure --enable-threads=posix defines GC_WIN32_THREADS.)  Threads must be
-created with GC_CreateThread.  This can be accomplished by
-including gc.h and then calling CreateThread, which is redefined
-by gc.h.
-
-For the statically linked versions, it is required that GC_init()
-be called before other GC calls, since there seems to be no implicit way
-to initialize the allocation lock.  The easiest way to ensure this in
-portable code is to call GC_INIT() from the main executable (not
-a dynamic library) before calling any other GC_ routines.
-
-We strongly advise against using the TerminateThread() win32 API call,
-especially with the garbage collector.  Any use is likely to provoke a
-crash in the GC, since it makes it impossible for the collector to
-correctly track threads.
-
-
-Watcom compiler
----------------
-
-Ivan V. Demakov's README for the Watcom port:
-
-The collector has been compiled with Watcom C 10.6 and 11.0.
-It runs under win32, win32s, and even under msdos with dos4gw
-dos-extender. It should also run under OS/2, though this isn't
-tested. Under win32 the collector can be built either as dll
-or as static library.
-
-Note that all compilations were done under Windows 95 or NT.
-For unknown reason compiling under Windows 3.11 for NT (one
-attempt has been made) leads to broken executables.
-
-Incremental collection is not supported.
-
-cord is not ported.
-
-Before compiling you may need to edit WCC_MAKEFILE to set target
-platform, library type (dynamic or static), calling conventions, and
-optimization options.
-
-To compile the collector and testing programs use the command:
-    wmake -f WCC_MAKEFILE
-
-All programs using gc should be compiled with 4-byte alignment.
-For further explanations on this see comments about Borland.
-
-If the gc is compiled as dll, the macro ``GC_DLL'' should be defined before
-including "gc.h" (for example, with -DGC_DLL compiler option). It's
-important, otherwise resulting programs will not run.
-
-Ivan Demakov (email: ivan@tgrad.nsk.su)
-
-Win32S
-------
-
-[The following is probably obsolete.  The win32s support is still in the
-collector, but I doubt anyone cares, or has tested it recently.]
-
-The collector runs under both win32s and win32, but with different semantics.
-Under win32, all writable pages outside of the heaps and stack are
-scanned for roots.  Thus the collector sees pointers in DLL data
-segments.  Under win32s, only the main data segment is scanned.
-(The main data segment should always be scanned.  Under some
-versions of win32s, other regions may also be scanned.)
-Thus all accessible objects should be accessible from local variables
-or variables in the main data segment.  Alternatively, other data
-segments (e.g. in DLLs) may be registered with the collector by
-calling GC_init() and then GC_register_root_section(a), where
-a is the address of some variable inside the data segment.  (Duplicate
-registrations are ignored, but not terribly quickly.)
-
-(There are two reasons for this.  We didn't want to see many 16:16
-pointers.  And the VirtualQuery call has different semantics under
-the two systems, and under different versions of win32s.)
-
diff --git a/boehm-gc/doc/barrett_diagram b/boehm-gc/doc/barrett_diagram
deleted file mode 100644
index 27e80dc15cd..00000000000
--- a/boehm-gc/doc/barrett_diagram
+++ /dev/null
@@ -1,106 +0,0 @@
-This is an ASCII diagram of the data structure used to check pointer
-validity.  It was provided by Dave Barrett <barrett@asgard.cs.colorado.edu>,
-and should be of use to others attempting to understand the code.
-The data structure in GC4.X is essentially the same.   -HB
-
-
-
-
-		Data Structure used by GC_base in gc3.7:
-			      21-Apr-94
-			 
-			
-
-
-    63                  LOG_TOP_SZ[11]  LOG_BOTTOM_SZ[10]   LOG_HBLKSIZE[13]
-   +------------------+----------------+------------------+------------------+
- p:|                  |   TL_HASH(hi)  |                  |   HBLKDISPL(p)   |
-   +------------------+----------------+------------------+------------------+
-    \-----------------------HBLKPTR(p)-------------------/
-    \------------hi-------------------/ 
-                      \______ ________/ \________ _______/ \________ _______/
-                             V                   V                  V
-                             |                   |                  |
-           GC_top_index[]    |                   |                  | 
- ---      +--------------+   |                   |                  |  
-  ^       |              |   |                   |                  |   
-  |       |              |   |                   |                  |   
- TOP      +--------------+<--+                   |                  |      
- _SZ   +-<|      []      | *                     |                  |     
-(items)|  +--------------+  if 0 < bi< HBLKSIZE  |                  |    
-  |    |  |              | then large object     |                  |    
-  |    |  |              | starts at the bi'th   |                  |    
-  v    |  |              | HBLK before p.        |             i    |    
- ---   |  +--------------+                       |          (word-  |    
-       v                                         |         aligned) |    
-   bi= |GET_BI(p){->hash_link}->key==hi          |                  |   
-       v                                         |                  |    
-       |   (bottom_index)  \ scratch_alloc'd     |                  |    
-       |   ( struct  bi )  / by get_index()      |                  |    
- ---   +->+--------------+                       |                  |    
-  ^       |              |                       |                  |
-  ^       |              |                       |                  |
- BOTTOM   |              |   ha=GET_HDR_ADDR(p)  |                  |
-_SZ(items)+--------------+<----------------------+          +-------+
-  |   +--<|   index[]    |                                  |         
-  |   |   +--------------+                      GC_obj_map: v              
-  |   |   |              |              from      / +-+-+-----+-+-+-+-+  --- 
-  v   |   |              |              GC_add   < 0| | |     | | | | |   ^  
- ---  |   +--------------+             _map_entry \ +-+-+-----+-+-+-+-+   |  
-      |   |   asc_link   |                          +-+-+-----+-+-+-+-+ MAXOBJSZ
-      |   +--------------+                      +-->| | |  j  | | | | |  +1   
-      |   |     key      |                      |   +-+-+-----+-+-+-+-+   |  
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+   | 
-      |   |  hash_link   |                      |   | | |     | | | | |   v 
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+  ---
-      |                                         |   |<--MAX_OFFSET--->|   
-      |                                         |         (bytes)
-HDR(p)| GC_find_header(p)                       |   |<--MAP_ENTRIES-->| 
-      |                           \ from        |    =HBLKSIZE/WORDSZ   
-      |    (hdr) (struct hblkhdr) / alloc_hdr() |    (1024 on Alpha)
-      +-->+----------------------+              |    (8/16 bits each)
-GET_HDR(p)| word   hb_sz (words) |              |          
-          +----------------------+              |     
-          | struct hblk *hb_next |              |
-          +----------------------+              |       
-          |mark_proc hb_mark_proc|              |
-          +----------------------+              |
-          | char * hb_map        |>-------------+
-          +----------------------+           
-          | ushort hb_obj_kind   |           
-          +----------------------+           
-          |   hb_last_reclaimed  |           
- ---      +----------------------+                
-  ^       |                      |
- MARK_BITS|       hb_marks[]     | *if hdr is free, hb_sz + DISCARD_WORDS
-_SZ(words)|                      |  is the size of a heap chunk (struct hblk)
-  v       |                      |  of at least MININCR*HBLKSIZE bytes (below),
- ---      +----------------------+  otherwise, size of each object in chunk.
-
-Dynamic data structures above are interleaved throughout the heap in blocks of 
-size MININCR * HBLKSIZE bytes as done by gc_scratch_alloc which cannot be
-freed; free lists are used (e.g. alloc_hdr).  HBLKs's below are collected.
-
-	      (struct hblk)      
- ---      +----------------------+ < HBLKSIZE ---         ---          DISCARD_
-  ^       |garbage[DISCARD_WORDS]|   aligned   ^           ^ HDR_BYTES WORDS
-  |       |                      |             |           v (bytes)   (words)
-  |       +-----hb_body----------+ < WORDSZ    |          ---   ---   
-  |       |                      |   aligned   |           ^     ^
-  |       |      Object 0        |             |           hb_sz |
-  |       |                      |           i |(word-    (words)|
-  |       |                      |      (bytes)|aligned)   v     |
-  |       + - - - - - - - - - - -+ ---         |          ---    |
-  |       |                      |  ^          |           ^     |
-  n *     |                      |  j (words)  |          hb_sz BODY_SZ 
- HBLKSIZE |      Object 1        |  v          v           |   (words)
- (bytes)  |                      |---------------          v   MAX_OFFSET
-  |       + - - - - - - - - - - -+                        ---  (bytes)
-  |       |                      | !All_INTERIOR_PTRS      ^     |
-  |       |                      | sets j only for       hb_sz   |
-  |       |      Object N        | valid object offsets.   |     |
-  v       |                      | All objects WORDSZ      v     v
- ---      +----------------------+ aligned.               ---   ---
-
-DISCARD_WORDS is normally zero.  Indeed the collector has not been tested
-with another value in ages.
diff --git a/boehm-gc/doc/debugging.html b/boehm-gc/doc/debugging.html
deleted file mode 100644
index 7c65f2bb40a..00000000000
--- a/boehm-gc/doc/debugging.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Debugging Garbage Collector Related Problems</title>
-</head>
-<BODY>
-<H1>Debugging Garbage Collector Related Problems</h1>
-This page contains some hints on
-debugging issues specific to
-the Boehm-Demers-Weiser conservative garbage collector.
-It applies both to debugging issues in client code that manifest themselves
-as collector misbehavior, and to debugging the collector itself.
-<P>
-If you suspect a bug in the collector itself, it is strongly recommended
-that you try the latest collector release, even if it is labelled as "alpha",
-before proceeding.
-<H2>Bus Errors and Segmentation Violations</h2>
-<P>
-If the fault occurred in GC_find_limit, or with incremental collection enabled,
-this is probably normal.  The collector installs handlers to take care of
-these.  You will not see these unless you are using a debugger.
-Your debugger <I>should</i> allow you to continue.
-It's often preferable to tell the debugger to ignore SIGBUS and SIGSEGV
-("<TT>handle SIGSEGV SIGBUS nostop noprint</tt>" in gdb,
-"<TT>ignore SIGSEGV SIGBUS</tt>" in most versions of dbx)
-and set a breakpoint in <TT>abort</tt>.
-The collector will call abort if the signal had another cause,
-and there was not other handler previously installed.
-<P>
-We recommend debugging without incremental collection if possible.
-(This applies directly to UNIX systems.
-Debugging with incremental collection under win32 is worse.  See README.win32.)
-<P>
-If the application generates an unhandled SIGSEGV or equivalent, it may
-often be easiest to set the environment variable GC_LOOP_ON_ABORT.  On many
-platforms, this will cause the collector to loop in a handler when the
-SIGSEGV is encountered (or when the collector aborts for some other reason),
-and a debugger can then be attached to the looping
-process.  This sidesteps common operating system problems related
-to incomplete core files for multithreaded applications, etc.
-<H2>Other Signals</h2>
-On most platforms, the multithreaded version of the collector needs one or
-two other signals for internal use by the collector in stopping threads.
-It is normally wise to tell the debugger to ignore these.  On Linux,
-the collector currently uses SIGPWR and SIGXCPU by default.
-<H2>Warning Messages About Needing to Allocate Blacklisted Blocks</h2>
-The garbage collector generates warning messages of the form
-<PRE>
-Needed to allocate blacklisted block at 0x...
-</pre>
-or
-<PRE>
-Repeated allocation of very large block ...
-</pre>
-when it needs to allocate a block at a location that it knows to be
-referenced by a false pointer.  These false pointers can be either permanent
-(<I>e.g.</i> a static integer variable that never changes) or temporary.
-In the latter case, the warning is largely spurious, and the block will
-eventually be reclaimed normally.
-In the former case, the program will still run correctly, but the block
-will never be reclaimed.  Unless the block is intended to be
-permanent, the warning indicates a memory leak.
-<OL>
-<LI>Ignore these warnings while you are using GC_DEBUG.  Some of the routines
-mentioned below don't have debugging equivalents.  (Alternatively, write
-the missing routines and send them to me.)
-<LI>Replace allocator calls that request large blocks with calls to
-<TT>GC_malloc_ignore_off_page</tt> or
-<TT>GC_malloc_atomic_ignore_off_page</tt>.  You may want to set a
-breakpoint in <TT>GC_default_warn_proc</tt> to help you identify such calls.
-Make sure that a pointer to somewhere near the beginning of the resulting block
-is maintained in a (preferably volatile) variable as long as
-the block is needed.
-<LI>
-If the large blocks are allocated with realloc, we suggest instead allocating
-them with something like the following.  Note that the realloc size increment
-should be fairly large (e.g. a factor of 3/2) for this to exhibit reasonable
-performance.  But we all know we should do that anyway.
-<PRE>
-void * big_realloc(void *p, size_t new_size)
-{
-    size_t old_size = GC_size(p);
-    void * result;
- 
-    if (new_size <= 10000) return(GC_realloc(p, new_size));
-    if (new_size <= old_size) return(p);
-    result = GC_malloc_ignore_off_page(new_size);
-    if (result == 0) return(0);
-    memcpy(result,p,old_size);
-    GC_free(p);
-    return(result);
-}
-</pre>
-
-<LI> In the unlikely case that even relatively small object
-(&lt;20KB) allocations are triggering these warnings, then your address
-space contains lots of "bogus pointers", i.e. values that appear to
-be pointers but aren't.  Usually this can be solved by using GC_malloc_atomic
-or the routines in gc_typed.h to allocate large pointer-free regions of bitmaps, etc.  Sometimes the problem can be solved with trivial changes of encoding
-in certain values.  It is possible, to identify the source of the bogus
-pointers by building the collector with <TT>-DPRINT_BLACK_LIST</tt>,
-which will cause it to print the "bogus pointers", along with their location.
-
-<LI> If you get only a fixed number of these warnings, you are probably only
-introducing a bounded leak by ignoring them.  If the data structures being
-allocated are intended to be permanent, then it is also safe to ignore them.
-The warnings can be turned off by calling GC_set_warn_proc with a procedure
-that ignores these warnings (e.g. by doing absolutely nothing).
-</ol>
-
-<H2>The Collector References a Bad Address in <TT>GC_malloc</tt></h2>
-
-This typically happens while the collector is trying to remove an entry from
-its free list, and the free list pointer is bad because the free list link
-in the last allocated object was bad.
-<P>
-With &gt; 99% probability, you wrote past the end of an allocated object.
-Try setting <TT>GC_DEBUG</tt> before including <TT>gc.h</tt> and
-allocating with <TT>GC_MALLOC</tt>.  This will try to detect such
-overwrite errors.
-
-<H2>Unexpectedly Large Heap</h2>
-
-Unexpected heap growth can be due to one of the following:
-<OL>
-<LI> Data structures that are being unintentionally retained.  This
-is commonly caused by data structures that are no longer being used,
-but were not cleared, or by caches growing without bounds.
-<LI> Pointer misidentification.  The garbage collector is interpreting
-integers or other data as pointers and retaining the "referenced"
-objects.  A common symptom is that GC_dump() shows much of the heap
-as black-listed.
-<LI> Heap fragmentation.  This should never result in unbounded growth,
-but it may account for larger heaps.  This is most commonly caused
-by allocation of large objects.  On some platforms it can be reduced
-by building with -DUSE_MUNMAP, which will cause the collector to unmap
-memory corresponding to pages that have not been recently used.
-<LI> Per object overhead.  This is usually a relatively minor effect, but
-it may be worth considering.  If the collector recognizes interior
-pointers, object sizes are increased, so that one-past-the-end pointers
-are correctly recognized.  The collector can be configured not to do this
-(<TT>-DDONT_ADD_BYTE_AT_END</tt>).
-<P>
-The collector rounds up object sizes so the result fits well into the
-chunk size (<TT>HBLKSIZE</tt>, normally 4K on 32 bit machines, 8K
-on 64 bit machines) used by the collector.   Thus it may be worth avoiding
-objects of size 2K + 1 (or 2K if a byte is being added at the end.)
-</ol>
-The last two cases can often be identified by looking at the output
-of a call to <TT>GC_dump()</tt>.  Among other things, it will print the
-list of free heap blocks, and a very brief description of all chunks in
-the heap, the object sizes they correspond to, and how many live objects
-were found in the chunk at the last collection.
-<P>
-Growing data structures can usually be identified by
-<OL>
-<LI> Building the collector with <TT>-DKEEP_BACK_PTRS</tt>,
-<LI> Preferably using debugging allocation (defining <TT>GC_DEBUG</tt>
-before including <TT>gc.h</tt> and allocating with <TT>GC_MALLOC</tt>),
-so that objects will be identified by their allocation site,
-<LI> Running the application long enough so
-that most of the heap is composed of "leaked" memory, and
-<LI> Then calling <TT>GC_generate_random_backtrace()</tt> from backptr.h
-a few times to determine why some randomly sampled objects in the heap are
-being retained.
-</ol>
-<P>
-The same technique can often be used to identify problems with false
-pointers, by noting whether the reference chains printed by
-<TT>GC_generate_random_backtrace()</tt> involve any misidentified pointers.
-An alternate technique is to build the collector with
-<TT>-DPRINT_BLACK_LIST</tt> which will cause it to report values that
-are almost, but not quite, look like heap pointers.  It is very likely that
-actual false pointers will come from similar sources.
-<P>
-In the unlikely case that false pointers are an issue, it can usually
-be resolved using one or more of the following techniques:
-<OL>
-<LI> Use <TT>GC_malloc_atomic</tt> for objects containing no pointers.
-This is especially important for large arrays containing compressed data,
-pseudo-random numbers, and the like.  It is also likely to improve GC
-performance, perhaps drastically so if the application is paging.
-<LI> If you allocate large objects containing only
-one or two pointers at the beginning, either try the typed allocation
-primitives is <TT>gc_typed.h</tt>, or separate out the pointerfree component.
-<LI> Consider using <TT>GC_malloc_ignore_off_page()</tt>
-to allocate large objects.  (See <TT>gc.h</tt> and above for details.
-Large means &gt; 100K in most environments.)
-<LI> If your heap size is larger than 100MB or so, build the collector with
--DLARGE_CONFIG.  This allows the collector to keep more precise black-list
-information.
-<LI> If you are using heaps close to, or larger than, a gigabyte on a 32-bit
-machine, you may want to consider moving to a platform with 64-bit pointers.
-This is very likely to resolve any false pointer issues.
-</ol>
-<H2>Prematurely Reclaimed Objects</h2>
-The usual symptom of this is a segmentation fault, or an obviously overwritten
-value in a heap object.  This should, of course, be impossible.  In practice,
-it may happen for reasons like the following:
-<OL>
-<LI> The collector did not intercept the creation of threads correctly in
-a multithreaded application, <I>e.g.</i> because the client called
-<TT>pthread_create</tt> without including <TT>gc.h</tt>, which redefines it.
-<LI> The last pointer to an object in the garbage collected heap was stored
-somewhere were the collector couldn't see it, <I>e.g.</i> in an
-object allocated with system <TT>malloc</tt>, in certain types of
-<TT>mmap</tt>ed files,
-or in some data structure visible only to the OS.  (On some platforms,
-thread-local storage is one of these.)
-<LI> The last pointer to an object was somehow disguised, <I>e.g.</i> by
-XORing it with another pointer.
-<LI> Incorrect use of <TT>GC_malloc_atomic</tt> or typed allocation.
-<LI> An incorrect <TT>GC_free</tt> call.
-<LI> The client program overwrote an internal garbage collector data structure.
-<LI> A garbage collector bug.
-<LI> (Empirically less likely than any of the above.) A compiler optimization
-that disguised the last pointer.
-</ol>
-The following relatively simple techniques should be tried first to narrow
-down the problem:
-<OL>
-<LI> If you are using the incremental collector try turning it off for
-debugging.
-<LI> If you are using shared libraries, try linking statically.  If that works,
-ensure that DYNAMIC_LOADING is defined on your platform.
-<LI> Try to reproduce the problem with fully debuggable unoptimized code.
-This will eliminate the last possibility, as well as making debugging easier.
-<LI> Try replacing any suspect typed allocation and <TT>GC_malloc_atomic</tt>
-calls with calls to <TT>GC_malloc</tt>.
-<LI> Try removing any GC_free calls (<I>e.g.</i> with a suitable
-<TT>#define</tt>).
-<LI> Rebuild the collector with <TT>-DGC_ASSERTIONS</tt>.
-<LI> If the following works on your platform (i.e. if gctest still works
-if you do this), try building the collector with
-<TT>-DREDIRECT_MALLOC=GC_malloc_uncollectable</tt>.  This will cause
-the collector to scan memory allocated with malloc.
-</ol>
-If all else fails, you will have to attack this with a debugger.
-Suggested steps:
-<OL>
-<LI> Call <TT>GC_dump()</tt> from the debugger around the time of the failure.  Verify
-that the collectors idea of the root set (i.e. static data regions which
-it should scan for pointers) looks plausible.  If not, i.e. if it doesn't
-include some static variables, report this as
-a collector bug.  Be sure to describe your platform precisely, since this sort
-of problem is nearly always very platform dependent.
-<LI> Especially if the failure is not deterministic, try to isolate it to
-a relatively small test case.
-<LI> Set a break point in <TT>GC_finish_collection</tt>.  This is a good
-point to examine what has been marked, i.e. found reachable, by the
-collector.
-<LI> If the failure is deterministic, run the process
-up to the last collection before the failure.
-Note that the variable <TT>GC_gc_no</tt> counts collections and can be used
-to set a conditional breakpoint in the right one.  It is incremented just
-before the call to GC_finish_collection.
-If object <TT>p</tt> was prematurely recycled, it may be helpful to
-look at <TT>*GC_find_header(p)</tt> at the failure point.
-The <TT>hb_last_reclaimed</tt> field will identify the collection number
-during which its block was last swept.
-<LI> Verify that the offending object still has its correct contents at
-this point.
-Then call <TT>GC_is_marked(p)</tt> from the debugger to verify that the
-object has not been marked, and is about to be reclaimed.  Note that
-<TT>GC_is_marked(p)</tt> expects the real address of an object (the
-address of the debug header if there is one), and thus it may
-be more appropriate to call <TT>GC_is_marked(GC_base(p))</tt>
-instead.
-<LI> Determine a path from a root, i.e. static variable, stack, or
-register variable,
-to the reclaimed object.  Call <TT>GC_is_marked(q)</tt> for each object
-<TT>q</tt> along the path, trying to locate the first unmarked object, say
-<TT>r</tt>.
-<LI> If <TT>r</tt> is pointed to by a static root,
-verify that the location
-pointing to it is part of the root set printed by <TT>GC_dump()</tt>.  If it
-is on the stack in the main (or only) thread, verify that
-<TT>GC_stackbottom</tt> is set correctly to the base of the stack.  If it is
-in another thread stack, check the collector's thread data structure
-(<TT>GC_thread[]</tt> on several platforms) to make sure that stack bounds
-are set correctly.
-<LI> If <TT>r</tt> is pointed to by heap object <TT>s</tt>, check that the
-collector's layout description for <TT>s</tt> is such that the pointer field
-will be scanned.  Call <TT>*GC_find_header(s)</tt> to look at the descriptor
-for the heap chunk.  The <TT>hb_descr</tt> field specifies the layout
-of objects in that chunk.  See gc_mark.h for the meaning of the descriptor.
-(If it's low order 2 bits are zero, then it is just the length of the
-object prefix to be scanned.  This form is always used for objects allocated
-with <TT>GC_malloc</tt> or <TT>GC_malloc_atomic</tt>.)
-<LI> If the failure is not deterministic, you may still be able to apply some
-of the above technique at the point of failure.  But remember that objects
-allocated since the last collection will not have been marked, even if the
-collector is functioning properly.  On some platforms, the collector
-can be configured to save call chains in objects for debugging.
-Enabling this feature will also cause it to save the call stack at the
-point of the last GC in GC_arrays._last_stack.
-<LI> When looking at GC internal data structures remember that a number
-of <TT>GC_</tt><I>xxx</i> variables are really macro defined to
-<TT>GC_arrays._</tt><I>xxx</i>, so that
-the collector can avoid scanning them.
-</ol>
-</body>
-</html>
-
-
-
-
diff --git a/boehm-gc/doc/gc.man b/boehm-gc/doc/gc.man
deleted file mode 100644
index 2a550c71247..00000000000
--- a/boehm-gc/doc/gc.man
+++ /dev/null
@@ -1,97 +0,0 @@
-.TH GC_MALLOC 1L "2 October 2003"
-.SH NAME
-GC_malloc, GC_malloc_atomic, GC_free, GC_realloc, GC_enable_incremental, GC_register_finalizer, GC_malloc_ignore_off_page, GC_malloc_atomic_ignore_off_page, GC_set_warn_proc \- Garbage collecting malloc replacement
-.SH SYNOPSIS
-#include "gc.h"
-.br
-void * GC_malloc(size_t size);
-.br
-void GC_free(void *ptr);
-.br
-void * GC_realloc(void *ptr, size_t size);
-.br
-.sp
-cc ... gc.a
-.LP
-.SH DESCRIPTION
-.I GC_malloc
-and
-.I GC_free
-are plug-in replacements for standard malloc and free.  However,
-.I
-GC_malloc
-will attempt to reclaim inaccessible space automatically by invoking a conservative garbage collector at appropriate points.  The collector traverses all data structures accessible by following pointers from the machines registers, stack(s), data, and bss segments.  Inaccessible structures will be reclaimed.  A machine word is considered to be a valid pointer if it is an address inside an object allocated by
-.I
-GC_malloc
-or friends.
-.LP
-In most cases it is preferable to call the macros GC_MALLOC, GC_FREE, etc.
-instead of calling GC_malloc and friends directly.  This allows debugging
-versions of the routines to be substituted by defining GC_DEBUG before
-including gc.h.
-.LP
-See the documentation in the include file gc_cpp.h for an alternate, C++ specific interface to the garbage collector.
-.LP
-Unlike the standard implementations of malloc,
-.I
-GC_malloc
-clears the newly allocated storage.
-.I
-GC_malloc_atomic
-does not.  Furthermore, it informs the collector that the resulting object will never contain any pointers, and should therefore not be scanned by the collector.
-.LP
-.I
-GC_free
-can be used to deallocate objects, but its use is optional, and generally discouraged.
-.I
-GC_realloc
-has the standard realloc semantics.  It preserves pointer-free-ness.
-.I
-GC_register_finalizer
-allows for registration of functions that are invoked when an object becomes inaccessible.
-.LP
-The garbage collector tries to avoid allocating memory at locations that already appear to be referenced before allocation.  (Such apparent ``pointers'' are usually large integers and the like that just happen to look like an address.)  This may make it hard to allocate very large objects.  An attempt to do so may generate a warning.
-.LP
-.I
-GC_malloc_ignore_off_page
-and
-.I
-GC_malloc_atomic_ignore_off_page
-inform the collector that the client code will always maintain a pointer to near the beginning of the object (within the first 512 bytes), and that pointers beyond that can be ignored by the collector.  This makes it much easier for the collector to place large objects.  These are recommended for large object allocation.  (Objects expected to be larger than about 100KBytes should be allocated this way.)
-.LP
-It is also possible to use the collector to find storage leaks in programs destined to be run with standard malloc/free.  The collector can be compiled for thread-safe operation.  Unlike standard malloc, it is safe to call malloc after a previous malloc call was interrupted by a signal, provided the original malloc call is not resumed.
-.LP
-The collector may, on rare occasion produce warning messages.  On UNIX machines these appear on stderr.  Warning messages can be filtered, redirected, or ignored with
-.I
-GC_set_warn_proc
-This is recommended for production code.  See gc.h for details.
-.LP
-Fully portable code should call
-.I
-GC_INIT
-from the main program before making any other GC calls.
-On most platforms this does nothing and the collector is initialized on first use.
-On a few platforms explicit initialization is necessary.  And it can never hurt. 
-.LP
-Debugging versions of many of the above routines are provided as macros.  Their names are identical to the above, but consist of all capital letters.  If GC_DEBUG is defined before gc.h is included, these routines do additional checking, and allow the leak detecting version of the collector to produce slightly more useful output.  Without GC_DEBUG defined, they behave exactly like the lower-case versions.
-.LP
-On some machines, collection will be performed incrementally after a call to
-.I
-GC_enable_incremental.
-This may temporarily write protect pages in the heap.  See the README file for more information on how this interacts with system calls that write to the heap.
-.LP
-Other facilities not discussed here include limited facilities to support incremental collection on machines without appropriate VM support, provisions for providing more explicit object layout information to the garbage collector, more direct support for ``weak'' pointers, support for ``abortable'' garbage collections during idle time, etc.
-.LP
-.SH "SEE ALSO"
-The README and gc.h files in the distribution.  More detailed definitions of the functions exported by the collector are given there.  (The above list is not complete.)
-.LP
-The web site at http://www.hpl.hp.com/personal/Hans_Boehm/gc .
-.LP
-Boehm, H., and M. Weiser, "Garbage Collection in an Uncooperative Environment",
-\fISoftware Practice & Experience\fP, September 1988, pp. 807-820.
-.LP
-The malloc(3) man page.
-.LP
-.SH AUTHOR
-Hans-J. Boehm (Hans.Boehm@hp.com).
-Some of the code was written by others, most notably Alan Demers.
diff --git a/boehm-gc/doc/gcdescr.html b/boehm-gc/doc/gcdescr.html
deleted file mode 100644
index cab6bde4fba..00000000000
--- a/boehm-gc/doc/gcdescr.html
+++ /dev/null
@@ -1,560 +0,0 @@
-<HTML>
-<HEAD>
-    <TITLE> Conservative GC Algorithmic Overview </TITLE>
-    <AUTHOR> Hans-J. Boehm, HP Labs (Much of this was written at SGI)</author>
-</HEAD>
-<BODY>
-<H1> <I>This is under construction, and may always be.</i> </h1>
-<H1> Conservative GC Algorithmic Overview </h1>
-<P>
-This is a description of the algorithms and data structures used in our
-conservative garbage collector.  I expect the level of detail to increase
-with time.  For a survey of GC algorithms, see for example
-<A HREF="ftp://ftp.cs.utexas.edu/pub/garbage/gcsurvey.ps"> Paul Wilson's
-excellent paper</a>.  For an overview of the collector interface,
-see <A HREF="gcinterface.html">here</a>.
-<P>
-This description is targeted primarily at someone trying to understand the
-source code.  It specifically refers to variable and function names.
-It may also be useful for understanding the algorithms at a higher level.
-<P>
-The description here assumes that the collector is used in default mode.
-In particular, we assume that it used as a garbage collector, and not just
-a leak detector.  We initially assume that it is used in stop-the-world,
-non-incremental mode, though the presence of the incremental collector
-will be apparent in the design.
-We assume the default finalization model, but the code affected by that
-is very localized.
-<H2> Introduction </h2>
-The garbage collector uses a modified mark-sweep algorithm.  Conceptually
-it operates roughly in four phases, which are performed occasionally
-as part of a memory allocation:
-
-<OL>
-
-<LI>
-<I>Preparation</i> Each object has an associated mark bit.
-Clear all mark bits, indicating that all objects
-are potentially unreachable.
-
-<LI>
-<I>Mark phase</i> Marks all objects that can be reachable via chains of
-pointers from variables.  Often the collector has no real information
-about the location of pointer variables in the heap, so it
-views all static data areas, stacks and registers as potentially containing
-pointers.  Any bit patterns that represent addresses inside
-heap objects managed by the collector are viewed as pointers.
-Unless the client program has made heap object layout information
-available to the collector, any heap objects found to be reachable from
-variables are again scanned similarly.
-
-<LI>
-<I>Sweep phase</i> Scans the heap for inaccessible, and hence unmarked,
-objects, and returns them to an appropriate free list for reuse.  This is
-not really a separate phase; even in non incremental mode this is operation
-is usually performed on demand during an allocation that discovers an empty
-free list.  Thus the sweep phase is very unlikely to touch a page that
-would not have been touched shortly thereafter anyway.
-
-<LI>
-<I>Finalization phase</i> Unreachable objects which had been registered
-for finalization are enqueued for finalization outside the collector.
-
-</ol>
-
-<P>
-The remaining sections describe the memory allocation data structures,
-and then the last 3 collection phases in more detail. We conclude by
-outlining some of the additional features implemented in the collector.
-
-<H2>Allocation</h2>
-The collector includes its own memory allocator.  The allocator obtains
-memory from the system in a platform-dependent way.  Under UNIX, it
-uses either <TT>malloc</tt>, <TT>sbrk</tt>, or <TT>mmap</tt>.
-<P>
-Most static data used by the allocator, as well as that needed by the
-rest of the garbage collector is stored inside the
-<TT>_GC_arrays</tt> structure.
-This allows the garbage collector to easily ignore the collectors own
-data structures when it searches for root pointers.  Other allocator
-and collector internal data structures are allocated dynamically
-with <TT>GC_scratch_alloc</tt>. <TT>GC_scratch_alloc</tt> does not
-allow for deallocation, and is therefore used only for permanent data
-structures.
-<P>
-The allocator allocates objects of different <I>kinds</i>.
-Different kinds are handled somewhat differently by certain parts
-of the garbage collector.  Certain kinds are scanned for pointers,
-others are not.  Some may have per-object type descriptors that
-determine pointer locations.  Or a specific kind may correspond
-to one specific object layout.  Two built-in kinds are uncollectable.
-One (<TT>STUBBORN</tt>) is immutable without special precautions.
-In spite of that, it is very likely that most C clients of the
-collector currently
-use at most two kinds: <TT>NORMAL</tt> and <TT>PTRFREE</tt> objects.
-The <A HREF="http://gcc.gnu.org/java">gcj</a> runtime also makes
-heavy use of a kind (allocated with GC_gcj_malloc) that stores
-type information at a known offset in method tables.
-<P>
-The collector uses a two level allocator.  A large block is defined to
-be one larger than half of <TT>HBLKSIZE</tt>, which is a power of 2,
-typically on the order of the page size.
-<P>
-Large block sizes are rounded up to
-the next multiple of <TT>HBLKSIZE</tt> and then allocated by
-<TT>GC_allochblk</tt>.  Recent versions of the collector
-use an approximate best fit algorithm by keeping free lists for
-several large block sizes.
-The actual
-implementation of <TT>GC_allochblk</tt>
-is significantly complicated by black-listing issues
-(see below).
-<P>
-Small blocks are allocated in chunks of size <TT>HBLKSIZE</tt>.
-Each chunk is
-dedicated to only one object size and kind.  The allocator maintains
-separate free lists for each size and kind of object.
-<P>
-Once a large block is split for use in smaller objects, it can only
-be used for objects of that size, unless the collector discovers a completely
-empty chunk.  Completely empty chunks are restored to the appropriate
-large block free list.
-<P>
-In order to avoid allocating blocks for too many distinct object sizes,
-the collector normally does not directly allocate objects of every possible
-request size.  Instead request are rounded up to one of a smaller number
-of allocated sizes, for which free lists are maintained.  The exact
-allocated sizes are computed on demand, but subject to the constraint
-that they increase roughly in geometric progression.  Thus objects
-requested early in the execution are likely to be allocated with exactly
-the requested size, subject to alignment constraints.
-See <TT>GC_init_size_map</tt> for details.
-<P>
-The actual size rounding operation during small object allocation is
-implemented as a table lookup in <TT>GC_size_map</tt>.
-<P>
-Both collector initialization and computation of allocated sizes are
-handled carefully so that they do not slow down the small object fast
-allocation path.  An attempt to allocate before the collector is initialized,
-or before the appropriate <TT>GC_size_map</tt> entry is computed,
-will take the same path as an allocation attempt with an empty free list.
-This results in a call to the slow path code (<TT>GC_generic_malloc_inner</tt>)
-which performs the appropriate initialization checks.
-<P>
-In non-incremental mode, we make a decision about whether to garbage collect
-whenever an allocation would otherwise have failed with the current heap size.
-If the total amount of allocation since the last collection is less than
-the heap size divided by <TT>GC_free_space_divisor</tt>, we try to
-expand the heap.  Otherwise, we initiate a garbage collection.  This ensures
-that the amount of garbage collection work per allocated byte remains
-constant.
-<P>
-The above is in fact an oversimplification of the real heap expansion
-and GC triggering heuristic, which adjusts slightly for root size
-and certain kinds of
-fragmentation.  In particular:
-<UL>
-<LI> Programs with a large root set size and
-little live heap memory will expand the heap to amortize the cost of
-scanning the roots.  
-<LI> Versions 5.x of the collector actually collect more frequently in
-nonincremental mode.  The large block allocator usually refuses to split
-large heap blocks once the garbage collection threshold is
-reached.  This often has the effect of collecting well before the
-heap fills up, thus reducing fragmentation and working set size at the
-expense of GC time.  Versions 6.x choose an intermediate strategy depending
-on how much large object allocation has taken place in the past.
-(If the collector is configured to unmap unused pages, versions 6.x
-use the 5.x strategy.)
-<LI> In calculating the amount of allocation since the last collection we
-give partial credit for objects we expect to be explicitly deallocated.
-Even if all objects are explicitly managed, it is often desirable to collect
-on rare occasion, since that is our only mechanism for coalescing completely
-empty chunks.
-</ul>
-<P>
-It has been suggested that this should be adjusted so that we favor
-expansion if the resulting heap still fits into physical memory.
-In many cases, that would no doubt help.  But it is tricky to do this
-in a way that remains robust if multiple application are contending
-for a single pool of physical memory.
-
-<H2>Mark phase</h2>
-
-At each collection, the collector marks all objects that are
-possibly reachable from pointer variables.  Since it cannot generally
-tell where pointer variables are located, it scans the following
-<I>root segments</i> for pointers:
-<UL>
-<LI>The registers.  Depending on the architecture, this may be done using
-assembly code, or by calling a <TT>setjmp</tt>-like function which saves
-register contents on the stack.
-<LI>The stack(s).  In the case of a single-threaded application,
-on most platforms this
-is done by scanning the memory between (an approximation of) the current
-stack pointer and <TT>GC_stackbottom</tt>.  (For Itanium, the register stack
-scanned separately.)  The <TT>GC_stackbottom</tt> variable is set in
-a highly platform-specific way depending on the appropriate configuration
-information in <TT>gcconfig.h</tt>.  Note that the currently active
-stack needs to be scanned carefully, since callee-save registers of
-client code may appear inside collector stack frames, which may
-change during the mark process.  This is addressed by scanning
-some sections of the stack "eagerly", effectively capturing a snapshot
-at one point in time.
-<LI>Static data region(s).  In the simplest case, this is the region
-between <TT>DATASTART</tt> and <TT>DATAEND</tt>, as defined in
-<TT>gcconfig.h</tt>.  However, in most cases, this will also involve
-static data regions associated with dynamic libraries.  These are
-identified by the mostly platform-specific code in <TT>dyn_load.c</tt>.
-</ul> 
-The marker maintains an explicit stack of memory regions that are known
-to be accessible, but that have not yet been searched for contained pointers.
-Each stack entry contains the starting address of the block to be scanned,
-as well as a descriptor of the block.  If no layout information is
-available for the block, then the descriptor is simply a length.
-(For other possibilities, see <TT>gc_mark.h</tt>.)
-<P>
-At the beginning of the mark phase, all root segments
-(as described above) are pushed on the
-stack by <TT>GC_push_roots</tt>.  (Registers and eagerly processed
-stack sections are processed by pushing the referenced objects instead
-of the stack section itself.)  If <TT>ALL_INTERIOR_PTRS</tt> is not
-defined, then stack roots require special treatment.  In this case, the
-normal marking code ignores interior pointers, but <TT>GC_push_all_stack</tt>
-explicitly checks for interior pointers and pushes descriptors for target
-objects.
-<P>
-The marker is structured to allow incremental marking.
-Each call to <TT>GC_mark_some</tt> performs a small amount of
-work towards marking the heap.
-It maintains
-explicit state in the form of <TT>GC_mark_state</tt>, which
-identifies a particular sub-phase.  Some other pieces of state, most
-notably the mark stack, identify how much work remains to be done
-in each sub-phase.  The normal progression of mark states for
-a stop-the-world collection is:
-<OL>
-<LI> <TT>MS_INVALID</tt> indicating that there may be accessible unmarked
-objects.  In this case <TT>GC_objects_are_marked</tt> will simultaneously
-be false, so the mark state is advanced to
-<LI> <TT>MS_PUSH_UNCOLLECTABLE</tt> indicating that it suffices to push
-uncollectable objects, roots, and then mark everything reachable from them.
-<TT>Scan_ptr</tt> is advanced through the heap until all uncollectable
-objects are pushed, and objects reachable from them are marked.
-At that point, the next call to <TT>GC_mark_some</tt> calls
-<TT>GC_push_roots</tt> to push the roots.  It the advances the
-mark state to
-<LI> <TT>MS_ROOTS_PUSHED</tt> asserting that once the mark stack is
-empty, all reachable objects are marked.  Once in this state, we work
-only on emptying the mark stack.  Once this is completed, the state
-changes to
-<LI> <TT>MS_NONE</tt> indicating that reachable objects are marked.
-</ol>
-
-The core mark routine <TT>GC_mark_from</tt>, is called
-repeatedly by several of the sub-phases when the mark stack starts to fill
-up.  It is also called repeatedly in <TT>MS_ROOTS_PUSHED</tt> state
-to empty the mark stack.
-The routine is designed to only perform a limited amount of marking at
-each call, so that it can also be used by the incremental collector.
-It is fairly carefully tuned, since it usually consumes a large majority
-of the garbage collection time.
-<P>
-The fact that it perform a only a small amount of work per call also
-allows it to be used as the core routine of the parallel marker.  In that
-case it is normally invoked on thread-private mark stacks instead of the
-global mark stack.  More details can be found in
-<A HREF="scale.html">scale.html</a>
-<P>
-The marker correctly handles mark stack overflows.  Whenever the mark stack
-overflows, the mark state is reset to <TT>MS_INVALID</tt>.
-Since there are already marked objects in the heap,
-this eventually forces a complete
-scan of the heap, searching for pointers, during which any unmarked objects
-referenced by marked objects are again pushed on the mark stack.  This
-process is repeated until the mark phase completes without a stack overflow.
-Each time the stack overflows, an attempt is made to grow the mark stack.
-All pieces of the collector that push regions onto the mark stack have to be
-careful to ensure forward progress, even in case of repeated mark stack
-overflows.  Every mark attempt results in additional marked objects.
-<P>
-Each mark stack entry is processed by examining all candidate pointers
-in the range described by the entry.  If the region has no associated
-type information, then this typically requires that each 4-byte aligned
-quantity (8-byte aligned with 64-bit pointers) be considered a candidate
-pointer.
-<P>
-We determine whether a candidate pointer is actually the address of
-a heap block.  This is done in the following steps:
-<NL>
-<LI> The candidate pointer is checked against rough heap bounds.
-These heap bounds are maintained such that all actual heap objects
-fall between them.  In order to facilitate black-listing (see below)
-we also include address regions that the heap is likely to expand into.
-Most non-pointers fail this initial test.
-<LI> The candidate pointer is divided into two pieces; the most significant
-bits identify a <TT>HBLKSIZE</tt>-sized page in the address space, and
-the least significant bits specify an offset within that page.
-(A hardware page may actually consist of multiple such pages.
-HBLKSIZE is usually the page size divided by a small power of two.)
-<LI>
-The page address part of the candidate pointer is looked up in a
-<A HREF="tree.html">table</a>.
-Each table entry contains either 0, indicating that the page is not part
-of the garbage collected heap, a small integer <I>n</i>, indicating
-that the page is part of large object, starting at least <I>n</i> pages
-back, or a pointer to a descriptor for the page.  In the first case,
-the candidate pointer i not a true pointer and can be safely ignored.
-In the last two cases, we can obtain a descriptor for the page containing
-the beginning of the object.
-<LI>
-The starting address of the referenced object is computed.
-The page descriptor contains the size of the object(s)
-in that page, the object kind, and the necessary mark bits for those
-objects.  The size information can be used to map the candidate pointer
-to the object starting address.  To accelerate this process, the page header
-also contains a pointer to a precomputed map of page offsets to displacements
-from the beginning of an object.  The use of this map avoids a
-potentially slow integer remainder operation in computing the object
-start address.
-<LI>
-The mark bit for the target object is checked and set.  If the object
-was previously unmarked, the object is pushed on the mark stack.
-The descriptor is read from the page descriptor.  (This is computed
-from information <TT>GC_obj_kinds</tt> when the page is first allocated.)
-</nl>
-<P>
-At the end of the mark phase, mark bits for left-over free lists are cleared,
-in case a free list was accidentally marked due to a stray pointer.
-
-<H2>Sweep phase</h2>
-
-At the end of the mark phase, all blocks in the heap are examined.
-Unmarked large objects are immediately returned to the large object free list.
-Each small object page is checked to see if all mark bits are clear.
-If so, the entire page is returned to the large object free list.
-Small object pages containing some reachable object are queued for later
-sweeping, unless we determine that the page contains very little free
-space, in which case it is not examined further.
-<P>
-This initial sweep pass touches only block headers, not
-the blocks themselves.  Thus it does not require significant paging, even
-if large sections of the heap are not in physical memory.
-<P>
-Nonempty small object pages are swept when an allocation attempt
-encounters an empty free list for that object size and kind.
-Pages for the correct size and kind are repeatedly swept until at
-least one empty block is found.  Sweeping such a page involves
-scanning the mark bit array in the page header, and building a free
-list linked through the first words in the objects themselves.
-This does involve touching the appropriate data page, but in most cases
-it will be touched only just before it is used for allocation.
-Hence any paging is essentially unavoidable.
-<P>
-Except in the case of pointer-free objects, we maintain the invariant
-that any object in a small object free list is cleared (except possibly
-for the link field).  Thus it becomes the burden of the small object
-sweep routine to clear objects.  This has the advantage that we can
-easily recover from accidentally marking a free list, though that could
-also be handled by other means.  The collector currently spends a fair
-amount of time clearing objects, and this approach should probably be
-revisited.
-<P>
-In most configurations, we use specialized sweep routines to handle common
-small object sizes.  Since we allocate one mark bit per word, it becomes
-easier to examine the relevant mark bits if the object size divides
-the word length evenly.  We also suitably unroll the inner sweep loop
-in each case.  (It is conceivable that profile-based procedure cloning
-in the compiler could make this unnecessary and counterproductive.  I
-know of no existing compiler to which this applies.)
-<P>
-The sweeping of small object pages could be avoided completely at the expense
-of examining mark bits directly in the allocator.  This would probably
-be more expensive, since each allocation call would have to reload
-a large amount of state (e.g. next object address to be swept, position
-in mark bit table) before it could do its work.  The current scheme
-keeps the allocator simple and allows useful optimizations in the sweeper.
-
-<H2>Finalization</h2>
-Both <TT>GC_register_disappearing_link</tt> and
-<TT>GC_register_finalizer</tt> add the request to a corresponding hash
-table.  The hash table is allocated out of collected memory, but
-the reference to the finalizable object is hidden from the collector.
-Currently finalization requests are processed non-incrementally at the
-end of a mark cycle.  
-<P>
-The collector makes an initial pass over the table of finalizable objects,
-pushing the contents of unmarked objects onto the mark stack.
-After pushing each object, the marker is invoked to mark all objects
-reachable from it.  The object itself is not explicitly marked.
-This assures that objects on which a finalizer depends are neither
-collected nor finalized.
-<P>
-If in the process of marking from an object the
-object itself becomes marked, we have uncovered
-a cycle involving the object.  This usually results in a warning from the
-collector.  Such objects are not finalized, since it may be
-unsafe to do so.  See the more detailed
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/finalization.html"> discussion of finalization semantics</a>.
-<P>
-Any objects remaining unmarked at the end of this process are added to
-a queue of objects whose finalizers can be run.  Depending on collector
-configuration, finalizers are dequeued and run either implicitly during
-allocation calls, or explicitly in response to a user request.
-(Note that the former is unfortunately both the default and not generally safe.
-If finalizers perform synchronization, it may result in deadlocks.
-Nontrivial finalizers generally need to perform synchronization, and
-thus require a different collector configuration.)
-<P>
-The collector provides a mechanism for replacing the procedure that is
-used to mark through objects.  This is used both to provide support for
-Java-style unordered finalization, and to ignore certain kinds of cycles,
-<I>e.g.</i> those arising from C++ implementations of virtual inheritance.
-
-<H2>Generational Collection and Dirty Bits</h2>
-We basically use the concurrent and generational GC algorithm described in
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/papers/pldi91.ps.Z">"Mostly Parallel Garbage Collection"</a>,
-by Boehm, Demers, and Shenker.
-<P>
-The most significant modification is that
-the collector always starts running in the allocating thread.
-There is no separate garbage collector thread.  (If parallel GC is
-enabled, helper threads may also be woken up.)
-If an allocation attempt either requests a large object, or encounters
-an empty small object free list, and notices that there is a collection
-in progress, it immediately performs a small amount of marking work
-as described above.
-<P>
-This change was made both because we wanted to easily accommodate
-single-threaded environments, and because a separate GC thread requires
-very careful control over the scheduler to prevent the mutator from
-out-running the collector, and hence provoking unneeded heap growth.
-<P>
-In incremental mode, the heap is always expanded when we encounter
-insufficient space for an allocation.  Garbage collection is triggered
-whenever we notice that more than
-<TT>GC_heap_size</tt>/2 * <TT>GC_free_space_divisor</tt>
-bytes of allocation have taken place.
-After <TT>GC_full_freq</tt> minor collections a major collection
-is started.
-<P>
-All collections initially run interrupted until a predetermined
-amount of time (50 msecs by default) has expired.  If this allows
-the collection to complete entirely, we can avoid correcting
-for data structure modifications during the collection.  If it does
-not complete, we return control to the mutator, and perform small
-amounts of additional GC work during those later allocations that
-cannot be satisfied from small object free lists. When marking completes,
-the set of modified pages is retrieved, and we mark once again from
-marked objects on those pages, this time with the mutator stopped.
-<P>
-We keep track of modified pages using one of several distinct mechanisms:
-<OL>
-<LI>
-Through explicit mutator cooperation.  Currently this requires
-the use of <TT>GC_malloc_stubborn</tt>, and is rarely used.
-<LI>
-(<TT>MPROTECT_VDB</tt>) By write-protecting physical pages and
-catching write faults.  This is
-implemented for many Unix-like systems and for win32.  It is not possible
-in a few environments.
-<LI>
-(<TT>PROC_VDB</tt>) By retrieving dirty bit information from /proc.
-(Currently only Sun's
-Solaris supports this.  Though this is considerably cleaner, performance
-may actually be better with mprotect and signals.)
-<LI>
-(<TT>PCR_VDB</tt>) By relying on an external dirty bit implementation, in this
-case the one in Xerox PCR.
-<LI>
-(<TT>DEFAULT_VDB</tt>) By treating all pages as dirty.  This is the default if 
-none of the other techniques is known to be usable, and
-<TT>GC_malloc_stubborn</tt> is not used.  Practical only for testing, or if
-the vast majority of objects use <TT>GC_malloc_stubborn</tt>.
-</ol>
-
-<H2>Black-listing</h2>
-
-The collector implements <I>black-listing</i> of pages, as described
-in
-<A HREF="http://www.acm.org/pubs/citations/proceedings/pldi/155090/p197-boehm/">
-Boehm, ``Space Efficient Conservative Collection'', PLDI '93</a>, also available
-<A HREF="papers/pldi93.ps.Z">here</a>.
-<P>
-During the mark phase, the collector tracks ``near misses'', i.e. attempts
-to follow a ``pointer'' to just outside the garbage-collected heap, or
-to a currently unallocated page inside the heap.  Pages that have been
-the targets of such near misses are likely to be the targets of
-misidentified ``pointers'' in the future.  To minimize the future
-damage caused by such misidentifications they will be allocated only to
-small pointerfree objects. 
-<P>
-The collector understands two different kinds of black-listing.  A
-page may be black listed for interior pointer references
-(<TT>GC_add_to_black_list_stack</tt>), if it was the target of a near
-miss from a location that requires interior pointer recognition,
-<I>e.g.</i> the stack, or the heap if <TT>GC_all_interior_pointers</tt>
-is set.  In this case, we also avoid allocating large blocks that include
-this page.
-<P>
-If the near miss came from a source that did not require interior
-pointer recognition, it is black-listed with
-<TT>GC_add_to_black_list_normal</tt>.
-A page black-listed in this way may appear inside a large object,
-so long as it is not the first page of a large object.
-<P>
-The <TT>GC_allochblk</tt> routine respects black-listing when assigning
-a block to a particular object kind and size.  It occasionally
-drops (i.e. allocates and forgets) blocks that are completely black-listed
-in order to avoid excessively long large block free lists containing
-only unusable blocks.  This would otherwise become an issue
-if there is low demand for small pointerfree objects.
-
-<H2>Thread support</h2>
-We support several different threading models.  Unfortunately Pthreads,
-the only reasonably well standardized thread model, supports too narrow
-an interface for conservative garbage collection.  There appears to be
-no completely portable way to allow the collector
-to coexist with various Pthreads
-implementations.  Hence we currently support only the more
-common Pthreads implementations.
-<P>
-In particular, it is very difficult for the collector to stop all other
-threads in the system and examine the register contents.  This is currently
-accomplished with very different mechanisms for some Pthreads
-implementations.  The Solaris implementation temporarily disables much
-of the user-level threads implementation by stopping kernel-level threads
-("lwp"s).  The Linux/HPUX/OSF1 and Irix implementations sends signals to
-individual Pthreads and has them wait in the signal handler.
-<P>
-The Linux and Irix implementations use
-only documented Pthreads calls, but rely on extensions to their semantics.
-The Linux implementation <TT>linux_threads.c</tt> relies on only very
-mild extensions to the pthreads semantics, and already supports a large number
-of other Unix-like pthreads implementations.  Our goal is to make this the
-only pthread support in the collector.
-<P>
-(The Irix implementation is separate only for historical reasons and should
-clearly be merged.  The current Solaris implementation probably performs
-better in the uniprocessor case, but does not support thread operations in the
-collector.  Hence it cannot support the parallel marker.)
-<P>
-All implementations must
-intercept thread creation and a few other thread-specific calls to allow
-enumeration of threads and location of thread stacks.  This is current
-accomplished with <TT># define</tt>'s in <TT>gc.h</tt>
-(really <TT>gc_pthread_redirects.h</tt>), or optionally
-by using ld's function call wrapping mechanism under Linux.
-<P>
-Recent versions of the collector support several facilites to enhance
-the processor-scalability and thread performance of the collector.
-These are discussed in more detail <A HREF="scale.html">here</a>.
-<P>
-Comments are appreciated.  Please send mail to
-<A HREF="mailto:boehm@acm.org"><TT>boehm@acm.org</tt></a> or
-<A HREF="mailto:Hans.Boehm@hp.com"><TT>Hans.Boehm@hp.com</tt></a>
-<P>
-This is a modified copy of a page written while the author was at SGI.
-The original was <A HREF="http://reality.sgi.com/boehm/gcdescr.html">here</a>.
-</body>
-</html>
diff --git a/boehm-gc/doc/gcinterface.html b/boehm-gc/doc/gcinterface.html
deleted file mode 100644
index 1716514bec1..00000000000
--- a/boehm-gc/doc/gcinterface.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE HTML>
-<HEAD>
-<TITLE>Garbage Collector Interface</TITLE>
-</HEAD>
-<BODY>
-<H1>C Interface</h1>
-On many platforms, a single-threaded garbage collector library can be built
-to act as a plug-in malloc replacement.
-(Build with <TT>-DREDIRECT_MALLOC=GC_malloc -DIGNORE_FREE</tt>.)
-This is often the best way to deal with third-party libraries
-which leak or prematurely free objects.  <TT>-DREDIRECT_MALLOC</tt> is intended
-primarily as an easy way to adapt old code, not for new development.
-<P>
-New code should use the interface discussed below.
-<P>
-Code must be linked against the GC library.  On most UNIX platforms,
-depending on how the collector is built, this will be <TT>gc.a</tt>
-or <TT>libgc.{a,so}</tt>.
-<P>
-The following describes the standard C interface to the garbage collector.
-It is not a complete definition of the interface.  It describes only the
-most commonly used functionality, approximately in decreasing order of
-frequency of use.
-The full interface is described in
-<A HREF="http://hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gch.txt">gc.h</a>
-or <TT>gc.h</tt> in the distribution.
-<P>
-Clients should include <TT>gc.h</tt>.
-<P>
-In the case of multithreaded code,
-<TT>gc.h</tt> should be included after the threads header file, and
-after defining the appropriate <TT>GC_</tt><I>XXXX</i><TT>_THREADS</tt> macro.
-(For 6.2alpha4 and later, simply defining <TT>GC_THREADS</tt> should suffice.)
-The header file <TT>gc.h</tt> must be included
-in files that use either GC or threads primitives, since threads primitives
-will be redefined to cooperate with the GC on many platforms.
-<DL>
-<DT> <B>void * GC_MALLOC(size_t <I>nbytes</i>)</b>
-<DD>
-Allocates and clears <I>nbytes</i> of storage.
-Requires (amortized) time proportional to <I>nbytes</i>.
-The resulting object will be automatically deallocated when unreferenced.
-References from objects allocated with the system malloc are usually not
-considered by the collector.  (See <TT>GC_MALLOC_UNCOLLECTABLE</tt>, however.)
-<TT>GC_MALLOC</tt> is a macro which invokes <TT>GC_malloc</tt> by default or,
-if <TT>GC_DEBUG</tt>
-is defined before <TT>gc.h</tt> is included, a debugging version that checks
-occasionally for overwrite errors, and the like.
-<DT> <B>void * GC_MALLOC_ATOMIC(size_t <I>nbytes</i>)</b>
-<DD>
-Allocates <I>nbytes</i> of storage.
-Requires (amortized) time proportional to <I>nbytes</i>.
-The resulting object will be automatically deallocated when unreferenced.
-The client promises that the resulting object will never contain any pointers.
-The memory is not cleared.
-This is the preferred way to allocate strings, floating point arrays,
-bitmaps, etc.
-More precise information about pointer locations can be communicated to the
-collector using the interface in
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc_typedh.txt">gc_typed.h</a> in the distribution.
-<DT> <B>void * GC_MALLOC_UNCOLLECTABLE(size_t <I>nbytes</i>)</b>
-<DD>
-Identical to <TT>GC_MALLOC</tt>,
-except that the resulting object is not automatically
-deallocated.  Unlike the system-provided malloc, the collector does
-scan the object for pointers to garbage-collectable memory, even if the
-block itself does not appear to be reachable.  (Objects allocated in this way
-are effectively treated as roots by the collector.)
-<DT> <B> void * GC_REALLOC(void *<I>old</i>, size_t <I>new_size</i>) </b>
-<DD>
-Allocate a new object of the indicated size and copy (a prefix of) the
-old object into the new object.  The old object is reused in place if
-convenient.  If the original object was allocated with
-<TT>GC_MALLOC_ATOMIC</tt>,
-the new object is subject to the same constraints.  If it was allocated
-as an uncollectable object, then the new object is uncollectable, and
-the old object (if different) is deallocated.
-<DT> <B> void GC_FREE(void *<I>dead</i>) </b>
-<DD>
-Explicitly deallocate an object.  Typically not useful for small
-collectable objects.
-<DT> <B> void * GC_MALLOC_IGNORE_OFF_PAGE(size_t <I>nbytes</i>) </b>
-<DD>
-<DT> <B> void * GC_MALLOC_ATOMIC_IGNORE_OFF_PAGE(size_t <I>nbytes</i>) </b>
-<DD>
-Analogous to <TT>GC_MALLOC</tt> and <TT>GC_MALLOC_ATOMIC</tt>,
-except that the client
-guarantees that as long
-as the resulting object is of use, a pointer is maintained to someplace
-inside the first 512 bytes of the object.  This pointer should be declared
-volatile to avoid interference from compiler optimizations.
-(Other nonvolatile pointers to the object may exist as well.)
-This is the
-preferred way to allocate objects that are likely to be &gt; 100KBytes in size.
-It greatly reduces the risk that such objects will be accidentally retained
-when they are no longer needed.  Thus space usage may be significantly reduced.
-<DT> <B> void GC_INIT(void) </b>
-<DD>
-On some platforms, it is necessary to invoke this
-<I>from the main executable, not from a dynamic library,</i> before
-the initial invocation of a GC routine.  It is recommended that this be done
-in portable code, though we try to ensure that it expands to a no-op
-on as many platforms as possible.
-<DT> <B> void GC_gcollect(void) </b>
-<DD>
-Explicitly force a garbage collection.
-<DT> <B> void GC_enable_incremental(void) </b>
-<DD>
-Cause the garbage collector to perform a small amount of work
-every few invocations of <TT>GC_MALLOC</tt> or the like, instead of performing
-an entire collection at once.  This is likely to increase total
-running time.  It will improve response on a platform that either has
-suitable support in the garbage collector (Linux and most Unix
-versions, win32 if the collector was suitably built) or if "stubborn"
-allocation is used (see
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gch.txt">gc.h</a>).
-On many platforms this interacts poorly with system calls 
-that write to the garbage collected heap.
-<DT> <B> GC_warn_proc GC_set_warn_proc(GC_warn_proc <I>p</i>) </b>
-<DD>
-Replace the default procedure used by the collector to print warnings.
-The collector
-may otherwise write to sterr, most commonly because GC_malloc was used
-in a situation in which GC_malloc_ignore_off_page would have been more
-appropriate.  See <A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gch.txt">gc.h</a> for details.
-<DT> <B> void GC_REGISTER_FINALIZER(...) </b>
-<DD>
-Register a function to be called when an object becomes inaccessible.
-This is often useful as a backup method for releasing system resources
-(<I>e.g.</i> closing files) when the object referencing them becomes
-inaccessible.
-It is not an acceptable method to perform actions that must be performed
-in a timely fashion.
-See <A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gch.txt">gc.h</a> for details of the interface.
-See <A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/finalization.html">here</a> for a more detailed discussion
-of the design.
-<P>
-Note that an object may become inaccessible before client code is done
-operating on objects referenced by its fields.
-Suitable synchronization is usually required.
-See <A HREF="http://portal.acm.org/citation.cfm?doid=604131.604153">here</a>
-or <A HREF="http://www.hpl.hp.com/techreports/2002/HPL-2002-335.html">here</a>
-for details.
-</dl>
-<P>
-If you are concerned with multiprocessor performance and scalability,
-you should consider enabling and using thread local allocation (<I>e.g.</i>
-<TT>GC_LOCAL_MALLOC</tt>, see <TT>gc_local_alloc.h</tt>.  If your platform
-supports it, you should build the collector with parallel marking support
-(<TT>-DPARALLEL_MARK</tt>, or <TT>--enable-parallel-mark</tt>).
-<P>
-If the collector is used in an environment in which pointer location
-information for heap objects is easily available, this can be passed on
-to the collector using the interfaces in either <TT>gc_typed.h</tt>
-or <TT>gc_gcj.h</tt>.
-<P>
-The collector distribution also includes a <B>string package</b> that takes
-advantage of the collector.  For details see
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/cordh.txt">cord.h</a>
-
-<H1>C++ Interface</h1>
-Usage of the collector from C++ is complicated by the fact that there
-are many "standard" ways to allocate memory in C++.  The default ::new
-operator, default malloc, and default STL allocators allocate memory
-that is not garbage collected, and is not normally "traced" by the
-collector.  This means that any pointers in memory allocated by these
-default allocators will not be seen by the collector.  Garbage-collectable
-memory referenced only by pointers stored in such default-allocated
-objects is likely to be reclaimed prematurely by the collector.
-<P>
-It is the programmers responsibility to ensure that garbage-collectable
-memory is referenced by pointers stored in one of
-<UL>
-<LI> Program variables
-<LI> Garbage-collected objects
-<LI> Uncollected but "traceable" objects
-</ul>
-"Traceable" objects are not necessarily reclaimed by the collector,
-but are scanned for pointers to collectable objects.
-They are allocated by <TT>GC_MALLOC_UNCOLLECTABLE</tt>, as described
-above, and through some interfaces described below.
-<P>
-The easiest way to ensure that collectable objects are properly referenced
-is to allocate only collectable objects.  This requires that every
-allocation go through one of the following interfaces, each one of
-which replaces a standard C++ allocation mechanism:
-<DL>
-<DT> <B> STL allocators </b>
-<DD>
-Users of the <A HREF="http://www.sgi.com/tech/stl">SGI extended STL</a>
-can include <TT>new_gc_alloc.h</tt> before including
-STL header files.
-(<TT>gc_alloc.h</tt> corresponds to now obsolete versions of the
-SGI STL.)
-This defines SGI-style allocators
-<UL>
-<LI> alloc
-<LI> single_client_alloc
-<LI> gc_alloc
-<LI> single_client_gc_alloc
-</ul>
-which may be used either directly to allocate memory or to instantiate
-container templates.  The first two allocate uncollectable but traced
-memory, while the second two allocate collectable memory.
-The single_client versions are not safe for concurrent access by
-multiple threads, but are faster.
-<P>
-For an example, click <A HREF="http://hpl.hp.com/personal/Hans_Boehm/gc/gc_alloc_exC.txt">here</a>.
-<P>
-Recent versions of the collector also include a more standard-conforming
-allocator implementation in <TT>gc_allocator.h</tt>.  It defines
-<UL>
-<LI> traceable_allocator
-<LI> gc_allocator
-</ul>
-Again the former allocates uncollectable but traced memory.
-This should work with any fully standard-conforming C++ compiler.
-<DT> <B> Class inheritance based interface </b>
-<DD>
-Users may include gc_cpp.h and then cause members of classes to
-be allocated in garbage collectable memory by having those classes
-inherit from class gc.
-For details see <A HREF="http://hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc_cpph.txt">gc_cpp.h</a>.
-<P>
-Linking against libgccpp in addition to the gc library overrides
-::new (and friends) to allocate traceable memory but uncollectable
-memory, making it safe to refer to collectable objects from the resulting
-memory.
-<DT> <B> C interface </b>
-<DD>
-It is also possible to use the C interface from 
-<A HREF="http://hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gch.txt">gc.h</a> directly.
-On platforms which use malloc to implement ::new, it should usually be possible
-to use a version of the collector that has been compiled as a malloc
-replacement.  It is also possible to replace ::new and other allocation
-functions suitably, as is done by libgccpp.
-<P>
-Note that user-implemented small-block allocation often works poorly with
-an underlying garbage-collected large block allocator, since the collector
-has to view all objects accessible from the user's free list as reachable.
-This is likely to cause problems if <TT>GC_MALLOC</tt>
-is used with something like
-the original HP version of STL.
-This approach works well with the SGI versions of the STL only if the
-<TT>malloc_alloc</tt> allocator is used.
-</dl>
-</body>
-</html>
diff --git a/boehm-gc/doc/leak.html b/boehm-gc/doc/leak.html
deleted file mode 100644
index 91fa8ea8402..00000000000
--- a/boehm-gc/doc/leak.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Using the Garbage Collector as Leak Detector</title>
-</head>
-<BODY>
-<H1>Using the Garbage Collector as Leak Detector</h1>
-The garbage collector may be used as a leak detector.
-In this case, the primary function of the collector is to report
-objects that were allocated (typically with <TT>GC_MALLOC</tt>),
-not deallocated (normally with <TT>GC_FREE</tt>), but are
-no longer accessible.  Since the object is no longer accessible,
-there in normally no way to deallocate the object at a later time;
-thus it can safely be assumed that the object has been "leaked".
-<P>
-This is substantially different from counting leak detectors,
-which simply verify that all allocated objects are eventually
-deallocated.  A garbage-collector based leak detector can provide
-somewhat more precise information when an object was leaked.
-More importantly, it does not report objects that are never
-deallocated because they are part of "permanent" data structures.
-Thus it does not require all objects to be deallocated at process
-exit time, a potentially useless activity that often triggers
-large amounts of paging.
-<P>
-All non-ancient versions of the garbage collector provide
-leak detection support.  Version 5.3 adds the following
-features:
-<OL>
-<LI> Leak detection mode can be initiated at run-time by
-setting GC_find_leak instead of building the collector with FIND_LEAK
-defined.  This variable should be set to a nonzero value
-at program startup.
-<LI> Leaked objects should be reported and then correctly garbage collected.
-Prior versions either reported leaks or functioned as a garbage collector.
-</ol>
-For the rest of this description we will give instructions that work
-with any reasonable version of the collector.
-<P>
-To use the collector as a leak detector, follow the following steps:
-<OL>
-<LI> Build the collector with -DFIND_LEAK.  Otherwise use default
-build options.
-<LI> Change the program so that all allocation and deallocation goes
-through the garbage collector.
-<LI> Arrange to call <TT>GC_gcollect</tt> at appropriate points to check
-for leaks.
-(For sufficiently long running programs, this will happen implicitly,
-but probably not with sufficient frequency.)
-</ol>
-The second step can usually be accomplished with the
-<TT>-DREDIRECT_MALLOC=GC_malloc</tt> option when the collector is built,
-or by defining <TT>malloc</tt>, <TT>calloc</tt>,
-<TT>realloc</tt> and <TT>free</tt>
-to call the corresponding garbage collector functions.
-But this, by itself, will not yield very informative diagnostics,
-since the collector does not keep track of information about
-how objects were allocated.  The error reports will include
-only object addresses.
-<P>
-For more precise error reports, as much of the program as possible
-should use the all uppercase variants of these functions, after
-defining <TT>GC_DEBUG</tt>, and then including <TT>gc.h</tt>.
-In this environment <TT>GC_MALLOC</tt> is a macro which causes
-at least the file name and line number at the allocation point to
-be saved as part of the object.  Leak reports will then also include
-this information.
-<P>
-Many collector features (<I>e.g</i> stubborn objects, finalization,
-and disappearing links) are less useful in this context, and are not
-fully supported.  Their use will usually generate additional bogus
-leak reports, since the collector itself drops some associated objects.
-<P>
-The same is generally true of thread support.  However, as of 6.0alpha4,
-correct leak reports should be generated with linuxthreads.
-<P>
-On a few platforms (currently Solaris/SPARC, Irix, and, with -DSAVE_CALL_CHAIN,
-Linux/X86), <TT>GC_MALLOC</tt>
-also causes some more information about its call stack to be saved
-in the object.  Such information is reproduced in the error
-reports in very non-symbolic form, but it can be very useful with the
-aid of a debugger.
-<H2>An Example</h2>
-The following header file <TT>leak_detector.h</tt> is included in the
-"include" subdirectory of the distribution:
-<PRE>
-#define GC_DEBUG
-#include "gc.h"
-#define malloc(n) GC_MALLOC(n)
-#define calloc(m,n) GC_MALLOC((m)*(n))
-#define free(p) GC_FREE(p)
-#define realloc(p,n) GC_REALLOC((p),(n))
-#define CHECK_LEAKS() GC_gcollect()
-</pre>
-<P>
-Assume the collector has been built with -DFIND_LEAK.  (For very
-new versions of the collector, we could instead add the statement
-<TT>GC_find_leak = 1</tt> as the first statement in <TT>main</tt>.
-<P>
-The program to be tested for leaks can then look like:
-<PRE>
-#include "leak_detector.h"
-
-main() {
-    int *p[10];
-    int i;
-    /* GC_find_leak = 1; for new collector versions not 	*/
-    /* compiled with -DFIND_LEAK.				*/
-    for (i = 0; i < 10; ++i) {
-	p[i] = malloc(sizeof(int)+i);
-    }
-    for (i = 1; i < 10; ++i) {
-	free(p[i]);
-    }
-    for (i = 0; i < 9; ++i) {
-	p[i] = malloc(sizeof(int)+i);
-    }
-    CHECK_LEAKS();
-}	
-</pre>
-<P>
-On an Intel X86 Linux system this produces on the stderr stream:
-<PRE>
-Leaked composite object at 0x806dff0 (leak_test.c:8, sz=4)
-</pre>
-(On most unmentioned operating systems, the output is similar to this.
-If the collector had been built on Linux/X86 with -DSAVE_CALL_CHAIN,
-the output would be closer to the Solaris example. For this to work,
-the program should not be compiled with -fomit_frame_pointer.)
-<P>
-On Irix it reports
-<PRE>
-Leaked composite object at 0x10040fe0 (leak_test.c:8, sz=4)
-        Caller at allocation:
-                ##PC##= 0x10004910
-</pre>
-and on Solaris the error report is
-<PRE>
-Leaked composite object at 0xef621fc8 (leak_test.c:8, sz=4)
-        Call chain at allocation:
-                args: 4 (0x4), 200656 (0x30FD0)
-                ##PC##= 0x14ADC
-                args: 1 (0x1), -268436012 (0xEFFFFDD4)
-                ##PC##= 0x14A64
-</pre>
-In the latter two cases some additional information is given about
-how malloc was called when the leaked object was allocated.  For
-Solaris, the first line specifies the arguments to <TT>GC_debug_malloc</tt>
-(the actual allocation routine), The second the program counter inside
-main, the third the arguments to <TT>main</tt>, and finally the program
-counter inside the caller to main (i.e. in the C startup code).
-<P>
-In the Irix case, only the address inside the caller to main is given.
-<P>
-In many cases, a debugger is needed to interpret the additional information.
-On systems supporting the "adb" debugger, the <TT>callprocs</tt> script
-can be used to replace program counter values with symbolic names.
-As of version 6.1, the collector tries to generate symbolic names for
-call stacks if it knows how to do so on the platform.  This is true on
-Linux/X86, but not on most other platforms.
-<H2>Simplified leak detection under Linux</h2>
-Since version 6.1, it should be possible to run the collector in leak
-detection mode on a program a.out under Linux/X86 as follows:
-<OL>
-<LI> Ensure that a.out is a single-threaded executable.  This doesn't yet work
-for multithreaded programs.
-<LI> If possible, ensure that the addr2line program is installed in
-/usr/bin.  (It comes with RedHat Linux.)
-<LI> If possible, compile a.out with full debug information.
-This will improve the quality of the leak reports.  With this approach, it is
-no longer necessary to call GC_ routines explicitly, though that can also
-improve the quality of the leak reports.
-<LI> Build the collector and install it in directory <I>foo</i> as follows:
-<UL>
-<LI> configure --prefix=<I>foo</i> --enable-full-debug --enable-redirect-malloc
---disable-threads
-<LI> make
-<LI> make install
-</ul>
-<LI> Set environment variables as follows:
-<UL>
-<LI> LD_PRELOAD=<I>foo</i>/lib/libgc.so
-<LI> GC_FIND_LEAK
-<LI> You may also want to set GC_PRINT_STATS (to confirm that the collector
-is running) and/or GC_LOOP_ON_ABORT (to facilitate debugging from another
-window if something goes wrong).
-</ul
-<LI> Simply run a.out as you normally would.  Note that if you run anything
-else (<I>e.g.</i> your editor) with those environment variables set,
-it will also be leak tested.  This may or may not be useful and/or
-embarrassing.  It can generate
-mountains of leak reports if the application wasn't designed to avoid leaks,
-<I>e.g.</i> because it's always short-lived.
-</ol>
-This has not yet been thropughly tested on large applications, but it's known
-to do the right thing on at least some small ones.
-</body>
-</html>
diff --git a/boehm-gc/doc/scale.html b/boehm-gc/doc/scale.html
deleted file mode 100644
index 2e70148dfb7..00000000000
--- a/boehm-gc/doc/scale.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Garbage collector scalability</TITLE>
-</HEAD>
-<BODY>
-<H1>Garbage collector scalability</h1>
-In its default configuration, the Boehm-Demers-Weiser garbage collector
-is not thread-safe.  It can be made thread-safe for a number of environments
-by building the collector with the appropriate
-<TT>-D</tt><I>XXX</i><TT>-THREADS</tt> compilation
-flag.  This has primarily two effects:
-<OL>
-<LI> It causes the garbage collector to stop all other threads when
-it needs to see a consistent memory state.
-<LI> It causes the collector to acquire a lock around essentially all
-allocation and garbage collection activity.
-</ol>
-Since a single lock is used for all allocation-related activity, only one
-thread can be allocating or collecting at one point.  This inherently
-limits performance of multi-threaded applications on multiprocessors.
-<P>
-On most platforms, the allocator/collector lock is implemented as a
-spin lock with exponential back-off.  Longer wait times are implemented
-by yielding and/or sleeping.  If a collection is in progress, the pure
-spinning stage is skipped.  This has the advantage that uncontested and
-thus most uniprocessor lock acquisitions are very cheap.  It has the
-disadvantage that the application may sleep for small periods of time
-even when there is work to be done.  And threads may be unnecessarily
-woken up for short periods.  Nonetheless, this scheme empirically
-outperforms native queue-based mutual exclusion implementations in most
-cases, sometimes drastically so.
-<H2>Options for enhanced scalability</h2>
-Version 6.0 of the collector adds two facilities to enhance collector
-scalability on multiprocessors.  As of 6.0alpha1, these are supported 
-only under Linux on X86 and IA64 processors, though ports to other
-otherwise supported Pthreads platforms should be straightforward.
-They are intended to be used together.
-<UL>
-<LI>
-Building the collector with <TT>-DPARALLEL_MARK</tt> allows the collector to
-run the mark phase in parallel in multiple threads, and thus on multiple
-processors.  The mark phase typically consumes the large majority of the
-collection time.  Thus this largely parallelizes the garbage collector
-itself, though not the allocation process.  Currently the marking is
-performed by the thread that triggered the collection, together with
-<I>N</i>-1 dedicated
-threads, where <I>N</i> is the number of processors detected by the collector.
-The dedicated threads are created once at initialization time.
-<P>
-A second effect of this flag is to switch to a more concurrent
-implementation of <TT>GC_malloc_many</tt>, so that free lists can be
-built, and memory can be cleared, by more than one thread concurrently.
-<LI>
-Building the collector with -DTHREAD_LOCAL_ALLOC adds support for thread
-local allocation.  It does not, by itself, cause thread local allocation
-to be used.  It simply allows the use of the interface in 
-<TT>gc_local_alloc.h</tt>.
-<P>
-Memory returned from thread-local allocators is completely interchangeable
-with that returned by the standard allocators.  It may be used by other
-threads.  The only difference is that, if the thread allocates enough
-memory of a certain kind, it will build a thread-local free list for
-objects of that kind, and allocate from that.  This greatly reduces
-locking.  The thread-local free lists are refilled using 
-<TT>GC_malloc_many</tt>.
-<P>
-An important side effect of this flag is to replace the default
-spin-then-sleep lock to be replace by a spin-then-queue based implementation.
-This <I>reduces performance</i> for the standard allocation functions,
-though it usually improves performance when thread-local allocation is
-used heavily, and thus the number of short-duration lock acquisitions
-is greatly reduced.
-</ul>
-<P>
-The easiest way to switch an application to thread-local allocation is to
-<OL>
-<LI> Define the macro <TT>GC_REDIRECT_TO_LOCAL</tt>,
-and then include the <TT>gc.h</tt>
-header in each client source file.
-<LI> Invoke <TT>GC_thr_init()</tt> before any allocation.
-<LI> Allocate using <TT>GC_MALLOC</tt>, <TT>GC_MALLOC_ATOMIC</tt>,
-and/or <TT>GC_GCJ_MALLOC</tt>.
-</ol>
-<H2>The Parallel Marking Algorithm</h2>
-We use an algorithm similar to
-<A HREF="http://www.yl.is.s.u-tokyo.ac.jp/gc/">that developed by
-Endo, Taura, and Yonezawa</a> at the University of Tokyo.
-However, the data structures and implementation are different,
-and represent a smaller change to the original collector source,
-probably at the expense of extreme scalability.  Some of
-the refinements they suggest, <I>e.g.</i> splitting large
-objects, were also incorporated into out approach.
-<P>
-The global mark stack is transformed into a global work queue.
-Unlike the usual case, it never shrinks during a mark phase.
-The mark threads remove objects from the queue by copying them to a
-local mark stack and changing the global descriptor to zero, indicating
-that there is no more work to be done for this entry.
-This removal
-is done with no synchronization.  Thus it is possible for more than
-one worker to remove the same entry, resulting in some work duplication.
-<P>
-The global work queue grows only if a marker thread decides to
-return some of its local mark stack to the global one.  This
-is done if the global queue appears to be running low, or if
-the local stack is in danger of overflowing.  It does require
-synchronization, but should be relatively rare.
-<P>
-The sequential marking code is reused to process local mark stacks.
-Hence the amount of additional code required for parallel marking
-is minimal.
-<P>
-It should be possible to use generational collection in the presence of the
-parallel collector, by calling <TT>GC_enable_incremental()</tt>.
-This does not result in fully incremental collection, since parallel mark
-phases cannot currently be interrupted, and doing so may be too
-expensive.
-<P>
-Gcj-style mark descriptors do not currently mix with the combination
-of local allocation and incremental collection.  They should work correctly
-with one or the other, but not both.
-<P>
-The number of marker threads is set on startup to the number of
-available processors (or to the value of the <TT>GC_NPROCS</tt>
-environment variable).  If only a single processor is detected,
-parallel marking is disabled.
-<P>
-Note that setting GC_NPROCS to 1 also causes some lock acquisitions inside
-the collector to immediately yield the processor instead of busy waiting
-first.  In the case of a multiprocessor and a client with multiple
-simultaneously runnable threads, this may have disastrous performance
-consequences (e.g. a factor of 10 slowdown). 
-<H2>Performance</h2>
-We conducted some simple experiments with a version of
-<A HREF="gc_bench.html">our GC benchmark</a> that was slightly modified to
-run multiple concurrent client threads in the same address space.
-Each client thread does the same work as the original benchmark, but they share
-a heap.
-This benchmark involves very little work outside of memory allocation.
-This was run with GC 6.0alpha3 on a dual processor Pentium III/500 machine
-under Linux 2.2.12.
-<P>
-Running with a thread-unsafe collector,  the benchmark ran in 9
-seconds.  With the simple thread-safe collector,
-built with <TT>-DLINUX_THREADS</tt>, the execution time
-increased to 10.3 seconds, or 23.5 elapsed seconds with two clients.
-(The times for the <TT>malloc</tt>/i<TT>free</tt> version
-with glibc <TT>malloc</tt>
-are 10.51 (standard library, pthreads not linked),
-20.90 (one thread, pthreads linked),
-and 24.55 seconds respectively. The benchmark favors a
-garbage collector, since most objects are small.)
-<P>
-The following table gives execution times for the collector built
-with parallel marking and thread-local allocation support
-(<TT>-DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC</tt>).  We tested
-the client using either one or two marker threads, and running
-one or two client threads.  Note that the client uses thread local
-allocation exclusively.  With -DTHREAD_LOCAL_ALLOC the collector
-switches to a locking strategy that is better tuned to less frequent
-lock acquisition.  The standard allocation primitives thus peform
-slightly worse than without -DTHREAD_LOCAL_ALLOC, and should be
-avoided in time-critical code.
-<P>
-(The results using <TT>pthread_mutex_lock</tt>
-directly for allocation locking would have been worse still, at
-least for older versions of linuxthreads.
-With THREAD_LOCAL_ALLOC, we first repeatedly try to acquire the
-lock with pthread_mutex_try_lock(), busy_waiting between attempts.
-After a fixed number of attempts, we use pthread_mutex_lock().)
-<P>
-These measurements do not use incremental collection, nor was prefetching
-enabled in the marker.  We used the C version of the benchmark.
-All measurements are in elapsed seconds on an unloaded machine.
-<P>
-<TABLE BORDER ALIGN="CENTER">
-<TR><TH>Number of threads</th><TH>1 marker thread (secs.)</th>
-<TH>2 marker threads (secs.)</th></tr>
-<TR><TD>1 client</td><TD ALIGN="CENTER">10.45</td><TD ALIGN="CENTER">7.85</td>
-<TR><TD>2 clients</td><TD ALIGN="CENTER">19.95</td><TD ALIGN="CENTER">12.3</td>
-</table>
-<PP>
-The execution time for the single threaded case is slightly worse than with
-simple locking.  However, even the single-threaded benchmark runs faster than
-even the thread-unsafe version if a second processor is available.
-The execution time for two clients with thread local allocation time is
-only 1.4 times the sequential execution time for a single thread in a
-thread-unsafe environment, even though it involves twice the client work.
-That represents close to a
-factor of 2 improvement over the 2 client case with the old collector.
-The old collector clearly
-still suffered from some contention overhead, in spite of the fact that the
-locking scheme had been fairly well tuned.
-<P>
-Full linear speedup (i.e. the same execution time for 1 client on one
-processor as 2 clients on 2 processors)
-is probably not achievable on this kind of
-hardware even with such a small number of processors,
-since the memory system is
-a major constraint for the garbage collector,
-the processors usually share a single memory bus, and thus
-the aggregate memory bandwidth does not increase in
-proportion to the number of processors. 
-<P>
-These results are likely to be very sensitive to both hardware and OS
-issues.  Preliminary experiments with an older Pentium Pro machine running
-an older kernel were far less encouraging.
-
-</body>
-</html>
diff --git a/boehm-gc/doc/simple_example.html b/boehm-gc/doc/simple_example.html
deleted file mode 100644
index 0bc0953ef03..00000000000
--- a/boehm-gc/doc/simple_example.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Using the Garbage Collector: A simple example</title>
-</head>
-<BODY>
-<H1>Using the Garbage Collector: A simple example</h1>
-The following consists of step-by-step instructions for building and
-using the collector.  We'll assume a Linux/gcc platform and
-a single-threaded application.  <FONT COLOR=green>The green
-text contains information about other platforms or scenarios.
-It can be skipped, especially on first reading</font>.
-<H2>Building the collector</h2>
-If you haven't already so, unpack the collector and enter
-the newly created directory with
-<PRE>
-tar xvfz gc<version>.tar.gz
-cd gc<version>
-</pre>
-<P>
-You can configure, build, and install the collector in a private
-directory, say /home/xyz/gc, with the following commands:
-<PRE>
-./configure --prefix=/home/xyz/gc --disable-threads
-make
-make check
-make install
-</pre>
-Here the "<TT>make check</tt>" command is optional, but highly recommended.
-It runs a basic correctness test which usually takes well under a minute.
-<FONT COLOR=green>
-<H3>Other platforms</h3>
-On non-Unix, non-Linux platforms, the collector is usually built by copying
-the appropriate makefile (see the platform-specific README in doc/README.xxx
-in the distribution) to the file "Makefile" (overwriting the copy of
-Makefile.direct that was originally there), and then typing "make"
-(or "nmake" or ...).  This builds the library in the source tree.  You may
-want to move it and the files in the include directory to a more convenient
-place.
-<P>
-If you use a makefile that does not require running a configure script,
-you should first look at the makefile, and adjust any options that are
-documented there.
-<P>
-If your platform provides a "make" utility, that is generally preferred
-to platform- and compiler- dependent "project" files.  (At least that is the
-strong preference of the would-be maintainer of those project files.)
-<H3>Threads</h3>
-If you need thread support, configure the collector with
-<PRE>
---enable-threads=posix --enable-thread-local-alloc --enable-parallel-mark
-</pre>
-instead of
-<TT>--disable-threads</tt>
-If your target is a real old-fashioned uniprocessor (no "hyperthreading",
-etc.) you will want to omit <TT>--enable-parallel-mark</tt>.
-<H3>C++</h3>
-You will need to include the C++ support, which unfortunately tends to
-be among the least portable parts of the collector, since it seems
-to rely on some corner cases of the language.  On Linux, it
-suffices to add <TT>--enable-cplusplus</tt> to the configure options.
-</font>
-<H2>Writing the program</h2>
-You will need a
-<PRE>
-#include "gc.h"
-</pre>
-at the beginning of every file that allocates memory through the
-garbage collector.  Call <TT>GC_MALLOC</tt> wherever you would
-have call <TT>malloc</tt>.  This initializes memory to zero like
-<TT>calloc</tt>; there is no need to explicitly clear the
-result.
-<P>
-If you know that an object will not contain pointers to the
-garbage-collected heap, and you don't need it to be initialized,
-call <TT>GC_MALLOC_ATOMIC</tt> instead.
-<P>
-A function <TT>GC_FREE</tt> is provided but need not be called.
-For very small objects, your program will probably perform better if
-you do not call it, and let the collector do its job.
-<P>
-A <TT>GC_REALLOC</tt> function behaves like the C library <TT>realloc</tt>.
-It allocates uninitialized pointer-free memory if the original
-object was allocated that way.
-<P>
-The following program <TT>loop.c</tt> is a trivial example:
-<PRE>
-#include "gc.h"
-#include &lt;assert.h&gt;
-#include &lt;stdio.h&gt;
-
-int main()
-{
-  int i;
-
-  GC_INIT();	/* Optional on Linux/X86; see below.  */
-  for (i = 0; i < 10000000; ++i)
-   {
-     int **p = (int **) GC_MALLOC(sizeof(int *));
-     int *q = (int *) GC_MALLOC_ATOMIC(sizeof(int));
-     assert(*p == 0);
-     *p = (int *) GC_REALLOC(q, 2 * sizeof(int));
-     if (i % 100000 == 0)
-       printf("Heap size = %d\n", GC_get_heap_size());
-   }
-  return 0;
-}
-</pre>
-<FONT COLOR=green>
-<H3>Interaction with the system malloc</h3>
-It is usually best not to mix garbage-collected allocation with the system
-<TT>malloc-free</tt>.  If you do, you need to be careful not to store
-pointers to the garbage-collected heap in memory allocated with the system
-<TT>malloc</tt>.
-<H3>Other Platforms</h3>
-On some other platforms it is necessary to call <TT>GC_INIT()</tt> from the main program,
-which is presumed to be part of the main executable, not a dynamic library.
-This can never hurt, and is thus generally good practice.
-
-<H3>Threads</h3>
-For a multithreaded program some more rules apply:
-<UL>
-<LI>
-Files that either allocate through the GC <I>or make thread-related calls</i>
-should first define the macro <TT>GC_THREADS</tt>, and then
-include <TT>"gc.h"</tt>.  On some platforms this will redefine some
-threads primitives, e.g. to let the collector keep track of thread creation.
-<LI>
-To take advantage of fast thread-local allocation, use the following instead
-of including <TT>gc.h</tt>:
-<PRE>
-#define GC_REDIRECT_TO_LOCAL
-#include "gc_local_alloc.h"
-</pre>
-This will cause GC_MALLOC and GC_MALLOC_ATOMIC to keep per-thread allocation
-caches, and greatly reduce the number of lock acquisitions during allocation.
-</ul>
-
-<H3>C++</h3>
-In the case of C++, you need to be especially careful not to store pointers
-to the garbage-collected heap in areas that are not traced by the collector.
-The collector includes some <A HREF="gcinterface.html">alternate interfaces</a>
-to make that easier.
-
-<H3>Debugging</h3>
-Additional debug checks can be performed by defining <TT>GC_DEBUG</tt> before
-including <TT>gc.h</tt>.  Additional options are available if the collector
-is also built with <TT>--enable-full_debug</tt> and all allocations are
-performed with <TT>GC_DEBUG</tt> defined.
-
-<H3>What if I can't rewrite/recompile my program?</h3>
-You may be able to build the collector with <TT>--enable-redirect-malloc</tt>
-and set the <TT>LD_PRELOAD</tt> environment variable to point to the resulting
-library, thus replacing the standard <TT>malloc</tt> with its garbage-collected
-counterpart.  This is rather platform dependent.  See the
-<A HREF="leak.html">leak detection documentation</a> for some more details.
-
-</font>
-
-<H2>Compiling and linking</h2>
-
-The above application <TT>loop.c</tt> test program can be compiled and linked
-with
-
-<PRE>
-cc -I/home/xyz/gc/include loop.c /home/xyz/gc/lib/libgc.a -o loop
-</pre>
-
-The <TT>-I</tt> option directs the compiler to the right include
-directory.  In this case, we list the static library
-directly on the compile line; the dynamic library could have been
-used instead, provided we arranged for the dynamic loader to find
-it, e.g. by setting <TT>LD_LIBRARY_PATH</tt>.
-
-<FONT COLOR=green>
-
-<H3>Threads</h3>
-
-On pthread platforms, you will of course also have to link with
-<TT>-lpthread</tt>,
-and compile with any thread-safety options required by your compiler.
-On some platforms, you may also need to link with <TT>-ldl</tt>
-or <TT>-lrt</tt>.
-Looking at threadlibs.c in the GC build directory
-should give you the appropriate
-list if a plain <TT>-lpthread</tt> doesn't work.
-
-</font>
-
-<H2>Running the executable</h2>
-
-The executable can of course be run normally, e.g. by typing
-
-<PRE>
-./loop
-</pre>
-
-The operation of the collector is affected by a number of environment variables.
-For example, setting <TT>GC_PRINT_STATS</tt> produces some
-GC statistics on stdout.
-See <TT>README.environment</tt> in the distribution for details.
-</body>
-</html>
diff --git a/boehm-gc/doc/tree.html b/boehm-gc/doc/tree.html
deleted file mode 100644
index c46a281cc67..00000000000
--- a/boehm-gc/doc/tree.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<HTML>
-<HEAD>
-    <TITLE>  Two-Level Tree Structure for Fast Pointer Lookup</TITLE>
-    <AUTHOR> Hans-J. Boehm, Silicon Graphics (now at HP)</author>
-</HEAD>
-<BODY>
-<H1>Two-Level Tree Structure for Fast Pointer Lookup</h1>
-<P>
-The conservative garbage collector described
-<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">here</a>
-uses a 2-level tree
-data structure to aid in fast pointer identification.
-This data structure is described in a bit more detail here, since
-<OL>
-<LI> Variations of the data structure are more generally useful.
-<LI> It appears to be hard to understand by reading the code.
-<LI> Some other collectors appear to use inferior data structures to
-solve the same problem.
-<LI> It is central to fast collector operation.
-</ol>
-A candidate pointer is divided into three sections, the <I>high</i>,
-<I>middle</i>, and <I>low</i> bits.  The exact division between these
-three groups of bits is dependent on the detailed collector configuration.
-<P>
-The high and middle bits are used to look up an entry in the table described
-here.  The resulting table entry consists of either a block descriptor
-(<TT>struct hblkhdr *</tt> or <TT>hdr *</tt>)
-identifying the layout of objects in the block, or an indication that this
-address range corresponds to the middle of a large block, together with a
-hint for locating the actual block descriptor.  Such a hint consist
-of a displacement that can be subtracted from the middle bits of the candidate
-pointer without leaving the object.
-<P>
-In either case, the block descriptor (<TT>struct hblkhdr</tt>)
-refers to a table of object starting addresses (the <TT>hb_map</tt> field).
-The starting address table is indexed by the low bits if the candidate pointer.
-The resulting entry contains a displacement to the beginning of the object,
-or an indication that this cannot be a valid object pointer.
-(If all interior pointer are recognized, pointers into large objects
-are handled specially, as appropriate.)
-
-<H2>The Tree</h2>
-<P>
-The rest of this discussion focuses on the two level data structure
-used to map the high and middle bits to the block descriptor.
-<P>
-The high bits are used as an index into the <TT>GC_top_index</tt> (really
-<TT>GC_arrays._top_index</tt>) array.  Each entry points to a
-<TT>bottom_index</tt> data structure.  This structure in turn consists
-mostly of an array <TT>index</tt> indexed by the middle bits of
-the candidate pointer.  The <TT>index</tt> array contains the actual
-<TT>hdr</tt> pointers. 
-<P>
-Thus a pointer lookup consists primarily of a handful of memory references,
-and can be quite fast:
-<OL>
-<LI> The appropriate <TT>bottom_index</tt> pointer is looked up in
-<TT>GC_top_index</tt>, based on the high bits of the candidate pointer.
-<LI> The appropriate <TT>hdr</tt> pointer is looked up in the
-<TT>bottom_index</tt> structure, based on the middle bits.
-<LI> The block layout map pointer is retrieved from the <TT>hdr</tt>
-structure.  (This memory reference is necessary since we try to share
-block layout maps.)
-<LI> The displacement to the beginning of the object is retrieved from the
-above map.
-</ol>
-<P>
-In order to conserve space, not all <TT>GC_top_index</tt> entries in fact
-point to distinct <TT>bottom_index</tt> structures.  If no address with
-the corresponding high bits is part of the heap, then the entry points
-to <TT>GC_all_nils</tt>, a single <TT>bottom_index</tt> structure consisting
-only of NULL <TT>hdr</tt> pointers.
-<P>
-<TT>Bottom_index</tt> structures contain slightly more information than
-just <TT>hdr</tt> pointers.  The <TT>asc_link</tt> field is used to link
-all <TT>bottom_index</tt> structures in ascending order for fast traversal.
-This list is pointed to be <TT>GC_all_bottom_indices</tt>.
-It is maintained with the aid of <TT>key</tt> field that contains the
-high bits corresponding to the <TT>bottom_index</tt>.
-
-<H2>64 bit addresses</h2>
-<P>
-In the case of 64 bit addresses, this picture is complicated slightly
-by the fact that one of the index structures would have to be huge to
-cover the entire address space with a two level tree.  We deal with this
-by turning <TT>GC_top_index</tt> into a chained hash table, instead of
-a simple array.  This adds a <TT>hash_link</tt> field to the
-<TT>bottom_index</tt> structure.
-<P>
-The "hash function" consists of dropping the high bits.  This is cheap to
-compute, and guarantees that there will be no collisions if the heap
-is contiguous and not excessively large.
-
-<H2>A picture</h2>
-<P>
-The following is an ASCII diagram of the data structure.
-This was contributed by Dave Barrett several years ago.
-<PRE>
-
-		Data Structure used by GC_base in gc3.7:
-			      21-Apr-94
-			 
-			
-
-
-    63                  LOG_TOP_SZ[11]  LOG_BOTTOM_SZ[10]   LOG_HBLKSIZE[13]
-   +------------------+----------------+------------------+------------------+
- p:|                  |   TL_HASH(hi)  |                  |   HBLKDISPL(p)   |
-   +------------------+----------------+------------------+------------------+
-    \-----------------------HBLKPTR(p)-------------------/
-    \------------hi-------------------/ 
-                      \______ ________/ \________ _______/ \________ _______/
-                             V                   V                  V
-                             |                   |                  |
-           GC_top_index[]    |                   |                  | 
- ---      +--------------+   |                   |                  |  
-  ^       |              |   |                   |                  |   
-  |       |              |   |                   |                  |   
- TOP      +--------------+<--+                   |                  |      
- _SZ   +-<|      []      | *                     |                  |     
-(items)|  +--------------+  if 0 < bi< HBLKSIZE  |                  |    
-  |    |  |              | then large object     |                  |    
-  |    |  |              | starts at the bi'th   |                  |    
-  v    |  |              | HBLK before p.        |             i    |    
- ---   |  +--------------+                       |          (word-  |    
-       v                                         |         aligned) |    
-   bi= |GET_BI(p){->hash_link}->key==hi          |                  |   
-       v                                         |                  |    
-       |   (bottom_index)  \ scratch_alloc'd     |                  |    
-       |   ( struct  bi )  / by get_index()      |                  |    
- ---   +->+--------------+                       |                  |    
-  ^       |              |                       |                  |
-  ^       |              |                       |                  |
- BOTTOM   |              |   ha=GET_HDR_ADDR(p)  |                  |
-_SZ(items)+--------------+<----------------------+          +-------+
-  |   +--<|   index[]    |                                  |         
-  |   |   +--------------+                      GC_obj_map: v              
-  |   |   |              |              from      / +-+-+-----+-+-+-+-+  --- 
-  v   |   |              |              GC_add   < 0| | |     | | | | |   ^  
- ---  |   +--------------+             _map_entry \ +-+-+-----+-+-+-+-+   |  
-      |   |   asc_link   |                          +-+-+-----+-+-+-+-+ MAXOBJSZ
-      |   +--------------+                      +-->| | |  j  | | | | |  +1   
-      |   |     key      |                      |   +-+-+-----+-+-+-+-+   |  
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+   | 
-      |   |  hash_link   |                      |   | | |     | | | | |   v 
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+  ---
-      |                                         |   |<--MAX_OFFSET--->|   
-      |                                         |         (bytes)
-HDR(p)| GC_find_header(p)                       |   |<--MAP_ENTRIES-->| 
-      |                           \ from        |    =HBLKSIZE/WORDSZ   
-      |    (hdr) (struct hblkhdr) / alloc_hdr() |    (1024 on Alpha)
-      +-->+----------------------+              |    (8/16 bits each)
-GET_HDR(p)| word   hb_sz (words) |              |          
-          +----------------------+              |     
-          | struct hblk *hb_next |              |
-          +----------------------+              |       
-          |mark_proc hb_mark_proc|              |
-          +----------------------+              |
-          | char * hb_map        |>-------------+
-          +----------------------+           
-          | ushort hb_obj_kind   |           
-          +----------------------+           
-          |   hb_last_reclaimed  |           
- ---      +----------------------+                
-  ^       |                      |
- MARK_BITS|       hb_marks[]     | *if hdr is free, hb_sz + DISCARD_WORDS
-_SZ(words)|                      |  is the size of a heap chunk (struct hblk)
-  v       |                      |  of at least MININCR*HBLKSIZE bytes (below),
- ---      +----------------------+  otherwise, size of each object in chunk.
-
-Dynamic data structures above are interleaved throughout the heap in blocks of 
-size MININCR * HBLKSIZE bytes as done by gc_scratch_alloc which cannot be
-freed; free lists are used (e.g. alloc_hdr).  HBLK's below are collected.
-
-	      (struct hblk)      
- ---      +----------------------+ < HBLKSIZE ---         ---          DISCARD_
-  ^       |garbage[DISCARD_WORDS]|   aligned   ^           ^ HDR_BYTES WORDS
-  |       |                      |             |           v (bytes)   (words)
-  |       +-----hb_body----------+ < WORDSZ    |          ---   ---   
-  |       |                      |   aligned   |           ^     ^
-  |       |      Object 0        |             |           hb_sz |
-  |       |                      |           i |(word-    (words)|
-  |       |                      |      (bytes)|aligned)   v     |
-  |       + - - - - - - - - - - -+ ---         |          ---    |
-  |       |                      |  ^          |           ^     |
-  n *     |                      |  j (words)  |          hb_sz BODY_SZ 
- HBLKSIZE |      Object 1        |  v          v           |   (words)
- (bytes)  |                      |---------------          v   MAX_OFFSET
-  |       + - - - - - - - - - - -+                        ---  (bytes)
-  |       |                      | !All_INTERIOR_PTRS      ^     |
-  |       |                      | sets j only for       hb_sz   |
-  |       |      Object N        | valid object offsets.   |     |
-  v       |                      | All objects WORDSZ      v     v
- ---      +----------------------+ aligned.               ---   ---
-
-DISCARD_WORDS is normally zero.  Indeed the collector has not been tested
-with another value in ages.
-</pre>
-</body>
diff --git a/boehm-gc/dyn_load.c b/boehm-gc/dyn_load.c
deleted file mode 100644
index eac2e71673f..00000000000
--- a/boehm-gc/dyn_load.c
+++ /dev/null
@@ -1,1505 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Original author: Bill Janssen
- * Heavily modified by Hans Boehm and others
- */
-
-/*
- * This is incredibly OS specific code for tracking down data sections in
- * dynamic libraries.  There appears to be no way of doing this quickly
- * without groveling through undocumented data structures.  We would argue
- * that this is a bug in the design of the dlopen interface.  THIS CODE
- * MAY BREAK IN FUTURE OS RELEASES.  If this matters to you, don't hesitate
- * to let your vendor know ...
- *
- * None of this is safe with dlclose and incremental collection.
- * But then not much of anything is safe in the presence of dlclose.
- */
-#if (defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)) \
-    && !defined(_GNU_SOURCE)
-    /* Can't test LINUX, since this must be define before other includes */
-#   define _GNU_SOURCE
-#endif
-#if !defined(MACOS) && !defined(_WIN32_WCE)
-#  include <sys/types.h>
-#endif
-#include "private/gc_priv.h"
-
-/* BTL: avoid circular redefinition of dlopen if GC_SOLARIS_THREADS defined */
-# if (defined(GC_PTHREADS) || defined(GC_SOLARIS_THREADS)) \
-      && defined(dlopen) && !defined(GC_USE_LD_WRAP)
-    /* To support threads in Solaris, gc.h interposes on dlopen by       */
-    /* defining "dlopen" to be "GC_dlopen", which is implemented below.  */
-    /* However, both GC_FirstDLOpenedLinkMap() and GC_dlopen() use the   */
-    /* real system dlopen() in their implementation. We first remove     */
-    /* gc.h's dlopen definition and restore it later, after GC_dlopen(). */
-#   undef dlopen
-#   define GC_must_restore_redefined_dlopen
-# else
-#   undef GC_must_restore_redefined_dlopen
-# endif
-
-#if (defined(DYNAMIC_LOADING) \
-	|| defined(MSWIN32)   \
-	|| defined(MSWINCE)   \
-	|| defined(CYGWIN32)) \
-    && !defined(PCR)
-#if !defined(SUNOS4) && !defined(SUNOS5DL) && !defined(IRIX5) && \
-    !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) && \
-    !(defined(ALPHA) && defined(OSF1)) && \
-    !defined(HPUX) && !(defined(LINUX) && defined(__ELF__)) && \
-    !defined(RS6000) && !defined(SCO_ELF) && !defined(DGUX) && \
-    !(defined(FREEBSD) && defined(__ELF__)) && \
-    !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
-    !defined(DARWIN)
- --> We only know how to find data segments of dynamic libraries for the
- --> above.  Additional SVR4 variants might not be too
- --> hard to add.
-#endif
-
-#include <stdio.h>
-#ifdef SUNOS5DL
-#   include <sys/elf.h>
-#   include <dlfcn.h>
-#   include <link.h>
-#endif
-#ifdef SUNOS4
-#   include <dlfcn.h>
-#   include <link.h>
-#   include <a.out.h>
-  /* struct link_map field overrides */
-#   define l_next	lm_next
-#   define l_addr	lm_addr
-#   define l_name	lm_name
-#endif
-#ifdef IRIX5
-#   include <elf.h>
-#   if _MIPS_SIM == _MIPS_SIM_ABI32 /* O32 ABI */
-     /* Don't include <obj_list.h> here. */
-#     include <obj.h>
-#   else /* N32 or N64 ABIs */
-#     include <objlist.h>
-#   endif
-#endif
-
-#if defined(NETBSD)
-#   include <machine/elf_machdep.h>
-#   define ELFSIZE ARCH_ELFSIZE
-#endif
-
-#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-    (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-    (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-#   include <stddef.h>
-#   include <elf.h>
-#   include <link.h>
-#endif
-
-/* Newer versions of GNU/Linux define this macro.  We
- * define it similarly for any ELF systems that don't.  */
-#  ifndef ElfW
-#    if defined(FREEBSD)
-#      if __ELF_WORD_SIZE == 32
-#        define ElfW(type) Elf32_##type
-#      else
-#        define ElfW(type) Elf64_##type
-#      endif
-#    else
-#      ifdef NETBSD
-#        if ELFSIZE == 32
-#          define ElfW(type) Elf32_##type
-#        else
-#          define ElfW(type) Elf64_##type
-#        endif
-#      else
-#        if !defined(ELF_CLASS) || ELF_CLASS == ELFCLASS32
-#          define ElfW(type) Elf32_##type
-#        else
-#          define ElfW(type) Elf64_##type
-#	 endif
-#      endif
-#    endif
-#  endif
-
-/* An user-supplied routine that is called to determine if a DSO must
-   be scanned by the gc.  */
-static int (*GC_has_static_roots)(const char *, void *, size_t);
-/* Register the routine.  */
-void
-GC_register_has_static_roots_callback 
-  (int (*callback)(const char *, void *, size_t))
-{
-  GC_has_static_roots = callback;
-}
-
-#if defined(SUNOS5DL) && !defined(USE_PROC_FOR_LIBRARIES)
-
-#ifdef LINT
-    Elf32_Dyn _DYNAMIC;
-#endif
-
-#define obj_offset(lm) ((unsigned long)(lm->l_addr))
-
-static struct link_map *
-GC_FirstDLOpenedLinkMap()
-{
-    extern ElfW(Dyn) _DYNAMIC;
-    ElfW(Dyn) *dp;
-    struct r_debug *r;
-    static struct link_map * cachedResult = 0;
-    static ElfW(Dyn) *dynStructureAddr = 0;
-    			/* BTL: added to avoid Solaris 5.3 ld.so _DYNAMIC bug */
-
-#   ifdef SUNOS53_SHARED_LIB
-	/* BTL: Avoid the Solaris 5.3 bug that _DYNAMIC isn't being set	*/
-	/* up properly in dynamically linked .so's. This means we have	*/
-	/* to use its value in the set of original object files loaded	*/
-	/* at program startup.						*/
-	if( dynStructureAddr == 0 ) {
-	  void* startupSyms = dlopen(0, RTLD_LAZY);
-	  dynStructureAddr = (ElfW(Dyn)*)dlsym(startupSyms, "_DYNAMIC");
-		}
-#   else
-	dynStructureAddr = &_DYNAMIC;
-#   endif
-
-    if( dynStructureAddr == 0) {
-        return(0);
-    }
-    if( cachedResult == 0 ) {
-        int tag;
-        for( dp = ((ElfW(Dyn) *)(&_DYNAMIC)); (tag = dp->d_tag) != 0; dp++ ) {
-            if( tag == DT_DEBUG ) {
-                struct link_map *lm
-                        = ((struct r_debug *)(dp->d_un.d_ptr))->r_map;
-                if( lm != 0 ) cachedResult = lm->l_next; /* might be NIL */
-                break;
-            }
-        }
-    }
-    return cachedResult;
-}
-
-#endif /* SUNOS5DL ... */
-
-/* BTL: added to fix circular dlopen definition if GC_SOLARIS_THREADS defined */
-# if defined(GC_must_restore_redefined_dlopen)
-#   define dlopen GC_dlopen
-# endif
-
-#if defined(SUNOS4) && !defined(USE_PROC_FOR_LIBRARIES)
-
-#ifdef LINT
-    struct link_dynamic _DYNAMIC;
-#endif
-
-#define obj_offset(lm) ((unsigned long)(lm->l_addr))
-
-static struct link_map *
-GC_FirstDLOpenedLinkMap()
-{
-    extern struct link_dynamic _DYNAMIC;
-
-    if( &_DYNAMIC == 0) {
-        return(0);
-    }
-    return(_DYNAMIC.ld_un.ld_1->ld_loaded);
-}
-
-/* Return the address of the ld.so allocated common symbol	*/
-/* with the least address, or 0 if none.			*/
-static ptr_t GC_first_common()
-{
-    ptr_t result = 0;
-    extern struct link_dynamic _DYNAMIC;
-    struct rtc_symb * curr_symbol;
-    
-    if( &_DYNAMIC == 0) {
-        return(0);
-    }
-    curr_symbol = _DYNAMIC.ldd -> ldd_cp;
-    for (; curr_symbol != 0; curr_symbol = curr_symbol -> rtc_next) {
-        if (result == 0
-            || (ptr_t)(curr_symbol -> rtc_sp -> n_value) < result) {
-            result = (ptr_t)(curr_symbol -> rtc_sp -> n_value);
-        }
-    }
-    return(result);
-}
-
-#endif  /* SUNOS4 ... */
-
-#if defined(IRIX5) && !defined(USE_PROC_FOR_LIBRARIES)
-
-/* Provide struct link map. */
-#  if _MIPS_SIM == _MIPS_SIM_ABI32 /* O32 ABI */
-/* Provide our own version of struct obj_list in <obj_list.h> with
-   correctly typed data member.  */
-struct obj_list {
-    struct obj *data;
-    struct obj_list *next;
-    struct obj_list *prev;
-} objList;
-
-struct link_map {
-    objList l_ol;
-};
-
-extern objList *__rld_obj_head;
-
-/* Map field names */
-#    define l_next	l_ol.next
-#    define l_addr	l_ol.data->o_pelfhdr	
-
-#    define obj_offset(lm) \
-	((unsigned long)(lm->l_ol.o_praw - (char *)lm->l_ol.o_base_address))
-#  else /* N32 or N64 ABIs */
-struct link_map {
-    ElfW(Obj_Info) l_oi;
-};
-
-extern ElfW(Obj_Info) *__rld_obj_head;
-
-/* Map field names */
-#    define l_next	l_oi.oi_next
-#    define l_addr	l_oi.oi_ehdr
-
-/* See gdb/solib-irix.c (fetch_lm_info).  */
-#    define obj_offset(lm) \
-	 ((unsigned long)(lm->l_oi.oi_ehdr - lm->l_oi.oi_orig_ehdr))
-#  endif
-
-static struct link_map *
-GC_FirstDLOpenedLinkMap()
-{
-    return (struct link_map *)__rld_obj_head;
-}
-
-#endif /* IRIX5 ... */
-
-# if defined(SUNOS4) || defined(SUNOS5DL) || defined(IRIX5)
-/* Add dynamic library data sections to the root set.		*/
-# if !defined(PCR) \
-     && !defined(GC_SOLARIS_PTHREADS) && !defined(GC_IRIX_THREADS) \
-     && defined(THREADS)
-#   ifndef SRC_M3
-	--> fix mutual exclusion with dlopen
-#   endif  /* We assume M3 programs don't call dlopen for now */
-# endif
-
-# ifndef USE_PROC_FOR_LIBRARIES
-void GC_register_dynamic_libraries()
-{
-  struct link_map *lm = GC_FirstDLOpenedLinkMap();
-  
-
-  for (lm = GC_FirstDLOpenedLinkMap();
-       lm != (struct link_map *) 0;  lm = (struct link_map *) lm->l_next)
-    {
-#     ifdef SUNOS4
-	struct exec *e;
-	 
-        e = (struct exec *) lm->lm_addr;
-        GC_add_roots_inner(
-      		    ((char *) (N_DATOFF(*e) + lm->lm_addr)),
-		    ((char *) (N_BSSADDR(*e) + e->a_bss + lm->lm_addr)),
-		    TRUE);
-#     endif
-#     if defined(SUNOS5DL) || defined(IRIX5)
-	ElfW(Ehdr) * e;
-        ElfW(Phdr) * p;
-        unsigned long offset;
-        char * start;
-        register int i;
-        
-	e = (ElfW(Ehdr) *) lm->l_addr;
-        p = ((ElfW(Phdr) *)(((char *)(e)) + e->e_phoff));
-        offset = obj_offset(lm);
-        for( i = 0; i < (int)(e->e_phnum); ((i++),(p++)) ) {
-          switch( p->p_type ) {
-            case PT_LOAD:
-              {
-                if( !(p->p_flags & PF_W) ) break;
-                start = ((char *)(p->p_vaddr)) + offset;
-                GC_add_roots_inner(
-                  start,
-                  start + p->p_memsz,
-                  TRUE
-                );
-              }
-              break;
-            default:
-              break;
-          }
-	}
-#     endif
-    }
-#   ifdef SUNOS4
-      {
-      	static ptr_t common_start = 0;
-      	ptr_t common_end;
-      	extern ptr_t GC_find_limit();
-      	
-      	if (common_start == 0) common_start = GC_first_common();
-      	if (common_start != 0) {
-      	    common_end = GC_find_limit(common_start, TRUE);
-      	    GC_add_roots_inner((char *)common_start, (char *)common_end, TRUE);
-      	}
-      }
-#   endif
-}
-
-# endif /* !USE_PROC ... */
-# endif /* SUNOS */
-
-#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-    (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-    (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-
-
-#ifdef USE_PROC_FOR_LIBRARIES
-
-#include <string.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#define MAPS_BUF_SIZE (32*1024)
-
-extern ssize_t GC_repeat_read(int fd, char *buf, size_t count);
-	/* Repeatedly read until buffer is filled, or EOF is encountered */
-	/* Defined in os_dep.c.  					 */
-
-char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
-                         char *prot_buf, unsigned int *maj_dev);
-word GC_apply_to_maps(word (*fn)(char *));
-	/* From os_dep.c	*/
-
-word GC_register_map_entries(char *maps)
-{
-    char prot_buf[5];
-    char *buf_ptr = maps;
-    int count;
-    word start, end;
-    unsigned int maj_dev;
-    word least_ha, greatest_ha;
-    unsigned i;
-    word datastart = (word)(DATASTART);
-
-    /* Compute heap bounds. FIXME: Should be done by add_to_heap?	*/
-	least_ha = (word)(-1);
-	greatest_ha = 0;
-	for (i = 0; i < GC_n_heap_sects; ++i) {
-	    word sect_start = (word)GC_heap_sects[i].hs_start;
-	    word sect_end = sect_start + GC_heap_sects[i].hs_bytes;
-	    if (sect_start < least_ha) least_ha = sect_start;
-	    if (sect_end > greatest_ha) greatest_ha = sect_end;
-        }
-    	if (greatest_ha < (word)GC_scratch_last_end_ptr)
-	    greatest_ha = (word)GC_scratch_last_end_ptr; 
-
-    for (;;) {
-        buf_ptr = GC_parse_map_entry(buf_ptr, &start, &end, prot_buf, &maj_dev);
-	if (buf_ptr == NULL) return 1;
-	if (prot_buf[1] == 'w') {
-	    /* This is a writable mapping.  Add it to		*/
-	    /* the root set unless it is already otherwise	*/
-	    /* accounted for.					*/
-	    if (start <= (word)GC_stackbottom && end >= (word)GC_stackbottom) {
-		/* Stack mapping; discard	*/
-		continue;
-	    }
-#	    ifdef THREADS
-	      if (GC_segment_is_thread_stack(start, end)) continue;
-#	    endif
-	    /* We no longer exclude the main data segment.		*/
-	    if (start < least_ha && end > least_ha) {
-		end = least_ha;
-	    }
-	    if (start < greatest_ha && end > greatest_ha) {
-		start = greatest_ha;
-	    }
-	    if (start >= least_ha && end <= greatest_ha) continue;
-	    GC_add_roots_inner((char *)start, (char *)end, TRUE);
-	}
-    }
-    return 1;
-}
-
-void GC_register_dynamic_libraries()
-{
-   if (!GC_apply_to_maps(GC_register_map_entries))
-       ABORT("Failed to read /proc for library registration.");
-}
-
-/* We now take care of the main data segment ourselves: */
-GC_bool GC_register_main_static_data()
-{
-  return FALSE;
-}
-
-# define HAVE_REGISTER_MAIN_STATIC_DATA
-
-#endif /* USE_PROC_FOR_LIBRARIES */
-
-#if !defined(USE_PROC_FOR_LIBRARIES)
-/* The following is the preferred way to walk dynamic libraries	*/
-/* For glibc 2.2.4+.  Unfortunately, it doesn't work for older	*/
-/* versions.  Thanks to Jakub Jelinek for most of the code.	*/
-
-# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-         || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) 
-
-/* We have the header files for a glibc that includes dl_iterate_phdr.	*/
-/* It may still not be available in the library on the target system.   */
-/* Thus we also treat it as a weak symbol.				*/
-#define HAVE_DL_ITERATE_PHDR
-#pragma weak dl_iterate_phdr
-#endif
-
-# if (defined(FREEBSD) && __FreeBSD__ >= 7)
-/* On the FreeBSD system, any target system at major version 7 shall    */
-/* have dl_iterate_phdr; therefore, we need not make it weak as above.  */
-#define HAVE_DL_ITERATE_PHDR
-#endif
-
-#if defined(HAVE_DL_ITERATE_PHDR)
-
-static int GC_register_dynlib_callback(info, size, ptr)
-     struct dl_phdr_info * info;
-     size_t size;
-     void * ptr;
-{
-  const ElfW(Phdr) * p;
-  char * start;
-  register int i;
-
-  /* Make sure struct dl_phdr_info is at least as big as we need.  */
-  if (size < offsetof (struct dl_phdr_info, dlpi_phnum)
-      + sizeof (info->dlpi_phnum))
-    return -1;
-
-  p = info->dlpi_phdr;
-  for( i = 0; i < (int)(info->dlpi_phnum); ((i++),(p++)) ) {
-    switch( p->p_type ) {
-      case PT_LOAD:
-	{
-	  if( !(p->p_flags & PF_W) ) break;
-	  start = ((char *)(p->p_vaddr)) + info->dlpi_addr;
-
-	  if (GC_has_static_roots 
-	      && !GC_has_static_roots(info->dlpi_name, start, p->p_memsz))
-	    break;
-
-	  GC_add_roots_inner(start, start + p->p_memsz, TRUE);
-	}
-      break;
-      default:
-	break;
-    }
-  }
-
-  * (int *)ptr = 1;	/* Signal that we were called */
-  return 0;
-}     
-
-/* Return TRUE if we succeed, FALSE if dl_iterate_phdr wasn't there. */
-
-GC_bool GC_register_dynamic_libraries_dl_iterate_phdr()
-{
-  if (dl_iterate_phdr) {
-    int did_something = 0;
-    dl_iterate_phdr(GC_register_dynlib_callback, &did_something);
-    if (!did_something) {
-	/* dl_iterate_phdr may forget the static data segment in	*/
-	/* statically linked executables.				*/
-	GC_add_roots_inner(DATASTART, (char *)(DATAEND), TRUE);
-#       if defined(DATASTART2)
-          GC_add_roots_inner(DATASTART2, (char *)(DATAEND2), TRUE);
-#       endif
-    }
-
-    return TRUE;
-  } else {
-    return FALSE;
-  }
-}
-
-/* Do we need to separately register the main static data segment? */
-GC_bool GC_register_main_static_data()
-{
-  return (dl_iterate_phdr == 0);
-}
-
-#define HAVE_REGISTER_MAIN_STATIC_DATA
-
-# else /* !LINUX || version(glibc) < 2.2.4 */
-
-/* Dynamic loading code for Linux running ELF. Somewhat tested on
- * Linux/x86, untested but hopefully should work on Linux/Alpha. 
- * This code was derived from the Solaris/ELF support. Thanks to
- * whatever kind soul wrote that.  - Patrick Bridges */
-
-/* This doesn't necessarily work in all cases, e.g. with preloaded
- * dynamic libraries.						*/
-
-#if defined(NETBSD)
-#  include <sys/exec_elf.h>
-/* for compatibility with 1.4.x */
-#  ifndef DT_DEBUG
-#  define DT_DEBUG     21
-#  endif
-#  ifndef PT_LOAD
-#  define PT_LOAD      1
-#  endif
-#  ifndef PF_W
-#  define PF_W         2
-#  endif
-#else
-#  include <elf.h>
-#endif
-#include <link.h>
-
-# endif
-
-#ifdef __GNUC__
-# pragma weak _DYNAMIC
-#endif
-extern ElfW(Dyn) _DYNAMIC[];
-
-static struct link_map *
-GC_FirstDLOpenedLinkMap()
-{
-    ElfW(Dyn) *dp;
-    static struct link_map *cachedResult = 0;
-
-    if( _DYNAMIC == 0) {
-        return(0);
-    }
-    if( cachedResult == 0 ) {
-        int tag;
-        for( dp = _DYNAMIC; (tag = dp->d_tag) != 0; dp++ ) {
-	    /* FIXME: The DT_DEBUG header is not mandated by the	*/
-	    /* ELF spec.  This code appears to be dependent on		*/
-	    /* idiosynchracies of older GNU tool chains.  If this code	*/
-	    /* fails for you, the real problem is probably that it is	*/
-	    /* being used at all.  You should be getting the 		*/
-	    /* dl_iterate_phdr version.					*/
-            if( tag == DT_DEBUG ) {
-                struct link_map *lm
-                        = ((struct r_debug *)(dp->d_un.d_ptr))->r_map;
-                if( lm != 0 ) cachedResult = lm->l_next; /* might be NIL */
-                break;
-            }
-        }
-    }
-    return cachedResult;
-}
-
-
-void GC_register_dynamic_libraries()
-{
-  struct link_map *lm;
-  
-
-# ifdef HAVE_DL_ITERATE_PHDR
-    if (GC_register_dynamic_libraries_dl_iterate_phdr()) {
-	return;
-    }
-# endif
-  lm = GC_FirstDLOpenedLinkMap();
-  for (lm = GC_FirstDLOpenedLinkMap();
-       lm != (struct link_map *) 0;  lm = lm->l_next)
-    {
-	ElfW(Ehdr) * e;
-        ElfW(Phdr) * p;
-        unsigned long offset;
-        char * start;
-        register int i;
-        
-	e = (ElfW(Ehdr) *) lm->l_addr;
-        p = ((ElfW(Phdr) *)(((char *)(e)) + e->e_phoff));
-        offset = ((unsigned long)(lm->l_addr));
-        for( i = 0; i < (int)(e->e_phnum); ((i++),(p++)) ) {
-          switch( p->p_type ) {
-            case PT_LOAD:
-              {
-                if( !(p->p_flags & PF_W) ) break;
-                start = ((char *)(p->p_vaddr)) + offset;
-                GC_add_roots_inner(start, start + p->p_memsz, TRUE);
-              }
-              break;
-            default:
-              break;
-          }
-	}
-    }
-}
-
-#endif /* !USE_PROC_FOR_LIBRARIES */
-
-#endif /* LINUX */
-
-#if defined(USE_PROC_FOR_LIBRARIES) && !defined(LINUX)
-
-#include <sys/procfs.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <elf.h>
-#include <errno.h>
-#include <signal.h>  /* Only for the following test. */
-#ifndef _sigargs
-# define IRIX6
-#endif
-
-extern void * GC_roots_present();
-	/* The type is a lie, since the real type doesn't make sense here, */
-	/* and we only test for NULL.					   */
-
-
-/* We use /proc to track down all parts of the address space that are	*/
-/* mapped by the process, and throw out regions we know we shouldn't	*/
-/* worry about.  This may also work under other SVR4 variants.		*/
-void GC_register_dynamic_libraries()
-{
-    static int fd = -1;
-    char buf[30];
-    static prmap_t * addr_map = 0;
-    static int current_sz = 0;	/* Number of records currently in addr_map */
-    static int needed_sz;	/* Required size of addr_map		*/
-    register int i;
-    register long flags;
-    register ptr_t start;
-    register ptr_t limit;
-    ptr_t heap_start = (ptr_t)HEAP_START;
-    ptr_t heap_end = heap_start;
-
-#   ifdef SUNOS5DL
-#     define MA_PHYS 0
-#   endif /* SUNOS5DL */
-
-    if (fd < 0) {
-      sprintf(buf, "/proc/%d", getpid());
-	/* The above generates a lint complaint, since pid_t varies.	*/
-	/* It's unclear how to improve this.				*/
-      fd = open(buf, O_RDONLY);
-      if (fd < 0) {
-    	ABORT("/proc open failed");
-      }
-    }
-    if (ioctl(fd, PIOCNMAP, &needed_sz) < 0) {
-	GC_err_printf2("fd = %d, errno = %d\n", fd, errno);
-    	ABORT("/proc PIOCNMAP ioctl failed");
-    }
-    if (needed_sz >= current_sz) {
-        current_sz = needed_sz * 2 + 1;
-        		/* Expansion, plus room for 0 record */
-        addr_map = (prmap_t *)GC_scratch_alloc((word)
-						(current_sz * sizeof(prmap_t)));
-    }
-    if (ioctl(fd, PIOCMAP, addr_map) < 0) {
-        GC_err_printf4("fd = %d, errno = %d, needed_sz = %d, addr_map = 0x%X\n",
-                        fd, errno, needed_sz, addr_map);
-    	ABORT("/proc PIOCMAP ioctl failed");
-    };
-    if (GC_n_heap_sects > 0) {
-    	heap_end = GC_heap_sects[GC_n_heap_sects-1].hs_start
-    			+ GC_heap_sects[GC_n_heap_sects-1].hs_bytes;
-    	if (heap_end < GC_scratch_last_end_ptr) heap_end = GC_scratch_last_end_ptr; 
-    }
-    for (i = 0; i < needed_sz; i++) {
-        flags = addr_map[i].pr_mflags;
-        if ((flags & (MA_BREAK | MA_STACK | MA_PHYS
-		      | MA_FETCHOP | MA_NOTCACHED)) != 0) goto irrelevant;
-        if ((flags & (MA_READ | MA_WRITE)) != (MA_READ | MA_WRITE))
-            goto irrelevant;
-          /* The latter test is empirically useless in very old Irix	*/
-	  /* versions.  Other than the					*/
-          /* main data and stack segments, everything appears to be	*/
-          /* mapped readable, writable, executable, and shared(!!).	*/
-          /* This makes no sense to me.	- HB				*/
-        start = (ptr_t)(addr_map[i].pr_vaddr);
-        if (GC_roots_present(start)) goto irrelevant;
-        if (start < heap_end && start >= heap_start)
-        	goto irrelevant;
-#	ifdef MMAP_STACKS
-	  if (GC_is_thread_stack(start)) goto irrelevant;
-#	endif /* MMAP_STACKS */
-
-        limit = start + addr_map[i].pr_size;
-	/* The following seemed to be necessary for very old versions 	*/
-	/* of Irix, but it has been reported to discard relevant	*/
-	/* segments under Irix 6.5.  					*/
-#	ifndef IRIX6
-	  if (addr_map[i].pr_off == 0 && strncmp(start, ELFMAG, 4) == 0) {
-	    /* Discard text segments, i.e. 0-offset mappings against	*/
-	    /* executable files which appear to have ELF headers.	*/
-	    caddr_t arg;
-	    int obj;
-#	    define MAP_IRR_SZ 10
-	    static ptr_t map_irr[MAP_IRR_SZ];
-	    				/* Known irrelevant map entries	*/
-	    static int n_irr = 0;
-	    struct stat buf;
-	    register int i;
-	    
-	    for (i = 0; i < n_irr; i++) {
-	        if (map_irr[i] == start) goto irrelevant;
-	    }
-	    arg = (caddr_t)start;
-	    obj = ioctl(fd, PIOCOPENM, &arg);
-	    if (obj >= 0) {
-	        fstat(obj, &buf);
-	        close(obj);
-	        if ((buf.st_mode & 0111) != 0) {
-	            if (n_irr < MAP_IRR_SZ) {
-	                map_irr[n_irr++] = start;
-	            }
-	            goto irrelevant;
-	        }
-	    }
-	  }
-#	endif /* !IRIX6 */
-        GC_add_roots_inner(start, limit, TRUE);
-      irrelevant: ;
-    }
-    /* Dont keep cached descriptor, for now.  Some kernels don't like us */
-    /* to keep a /proc file descriptor around during kill -9.		 */
-    	if (close(fd) < 0) ABORT("Couldnt close /proc file");
-	fd = -1;
-}
-
-# endif /* USE_PROC */
-
-# if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-
-# define WIN32_LEAN_AND_MEAN
-# define NOSERVICE
-# include <windows.h>
-# include <stdlib.h>
-
-  /* We traverse the entire address space and register all segments 	*/
-  /* that could possibly have been written to.				*/
-  
-  extern GC_bool GC_is_heap_base (ptr_t p);
-
-# ifdef GC_WIN32_THREADS
-    extern void GC_get_next_stack(char *start, char **lo, char **hi);
-    void GC_cond_add_roots(char *base, char * limit)
-    {
-      char * curr_base = base;
-      char * next_stack_lo;
-      char * next_stack_hi;
-   
-      if (base == limit) return;
-      for(;;) {
-	  GC_get_next_stack(curr_base, &next_stack_lo, &next_stack_hi);
-	  if (next_stack_lo >= limit) break;
-	  GC_add_roots_inner(curr_base, next_stack_lo, TRUE);
-	  curr_base = next_stack_hi;
-      }
-      if (curr_base < limit) GC_add_roots_inner(curr_base, limit, TRUE);
-    }
-# else
-    void GC_cond_add_roots(char *base, char * limit)
-    {
-      char dummy;
-      char * stack_top
-	 = (char *) ((word)(&dummy) & ~(GC_sysinfo.dwAllocationGranularity-1));
-      if (base == limit) return;
-      if (limit > stack_top && base < GC_stackbottom) {
-    	  /* Part of the stack; ignore it. */
-    	  return;
-      }
-      GC_add_roots_inner(base, limit, TRUE);
-    }
-# endif
-
-# if defined(MSWINCE) || defined(CYGWIN32)
-  /* Do we need to separately register the main static data segment? */
-  GC_bool GC_register_main_static_data()
-  {
-    return FALSE;
-  }
-# else /* win32 */
-  extern GC_bool GC_no_win32_dlls;
-
-  GC_bool GC_register_main_static_data()
-  {
-    return GC_no_win32_dlls;
-  }
-# endif /* win32 */
-  
-# define HAVE_REGISTER_MAIN_STATIC_DATA
-
-  /* The frame buffer testing code is dead in this version.	*/
-  /* We leave it here temporarily in case the switch to just 	*/
-  /* testing for MEM_IMAGE sections causes un expected 		*/
-  /* problems.							*/
-  GC_bool GC_warn_fb = TRUE;	/* Warn about traced likely 	*/
-  				/* graphics memory.		*/
-  GC_bool GC_disallow_ignore_fb = FALSE;
-  int GC_ignore_fb_mb;	/* Ignore mappings bigger than the 	*/
-  			/* specified number of MB.		*/
-  GC_bool GC_ignore_fb = FALSE; /* Enable frame buffer 	*/
-  				/* checking.		*/
-  
-  /* Issue warning if tracing apparent framebuffer. 		*/
-  /* This limits us to one warning, and it's a back door to	*/
-  /* disable that.						*/
- 
-  /* Should [start, start+len) be treated as a frame buffer	*/
-  /* and ignored?						*/
-  /* Unfortunately, we currently are not quite sure how to tell	*/
-  /* this automatically, and rely largely on user input.	*/
-  /* We expect that any mapping with type MEM_MAPPED (which 	*/
-  /* apparently excludes library data sections) can be safely	*/
-  /* ignored.  But we're too chicken to do that in this 	*/
-  /* version.							*/
-  /* Based on a very limited sample, it appears that:		*/
-  /* 	- Frame buffer mappings appear as mappings of large	*/
-  /*	  length, usually a bit less than a power of two.	*/
-  /*	- The definition of "a bit less" in the above cannot	*/
-  /*	  be made more precise.					*/
-  /*	- Have a starting address at best 64K aligned.		*/
-  /*	- Have type == MEM_MAPPED.				*/
-  static GC_bool is_frame_buffer(ptr_t start, size_t len, DWORD tp)
-  {
-    static GC_bool initialized = FALSE;
-#   define MB (1024*1024)
-#   define DEFAULT_FB_MB 15
-#   define MIN_FB_MB 3
-
-    if (GC_disallow_ignore_fb || tp != MEM_MAPPED) return FALSE;
-    if (!initialized) {
-      char * ignore_fb_string =  GETENV("GC_IGNORE_FB");
-
-      if (0 != ignore_fb_string) {
-	while (*ignore_fb_string == ' ' || *ignore_fb_string == '\t')
-	  ++ignore_fb_string;
-	if (*ignore_fb_string == '\0') {
-	  GC_ignore_fb_mb = DEFAULT_FB_MB;
-	} else {
-	  GC_ignore_fb_mb = atoi(ignore_fb_string);
-	  if (GC_ignore_fb_mb < MIN_FB_MB) {
-	    WARN("Bad GC_IGNORE_FB value.  Using %ld\n", DEFAULT_FB_MB);
-	    GC_ignore_fb_mb = DEFAULT_FB_MB;
-	  }
-	}
-	GC_ignore_fb = TRUE;
-      } else {
-	GC_ignore_fb_mb = DEFAULT_FB_MB;  /* For warning */
-      }
-      initialized = TRUE;
-    }
-    if (len >= ((size_t)GC_ignore_fb_mb << 20)) {
-      if (GC_ignore_fb) {
-	return TRUE;
-      } else {
-	if (GC_warn_fb) {
-	  WARN("Possible frame buffer mapping at 0x%lx: \n"
-	       "\tConsider setting GC_IGNORE_FB to improve performance.\n",
-	       start);
-	  GC_warn_fb = FALSE;
-	}
-	return FALSE;
-      }
-    } else {
-      return FALSE;
-    }
-  }
-
-# ifdef DEBUG_VIRTUALQUERY
-  void GC_dump_meminfo(MEMORY_BASIC_INFORMATION *buf)
-  {
-    GC_printf4("BaseAddress = %lx, AllocationBase = %lx, RegionSize = %lx(%lu)\n",
-	       buf -> BaseAddress, buf -> AllocationBase, buf -> RegionSize,
-	       buf -> RegionSize);
-    GC_printf4("\tAllocationProtect = %lx, State = %lx, Protect = %lx, "
-	       "Type = %lx\n",
-	       buf -> AllocationProtect, buf -> State, buf -> Protect,
-	       buf -> Type);
-  }
-# endif /* DEBUG_VIRTUALQUERY */
-
-# ifdef CYGWIN32
-#   define GC_wnt (TRUE)
-# else
-    extern GC_bool GC_wnt;  /* Is Windows NT derivative.	*/
-  			    /* Defined and set in os_dep.c.	*/
-# endif
-
-  void GC_register_dynamic_libraries()
-  {
-    MEMORY_BASIC_INFORMATION buf;
-    DWORD result;
-    DWORD protect;
-    LPVOID p;
-    char * base;
-    char * limit, * new_limit;
-
-#   ifdef MSWIN32
-      if (GC_no_win32_dlls) return;
-#   endif
-    base = limit = p = GC_sysinfo.lpMinimumApplicationAddress;
-#   if defined(MSWINCE) && !defined(_WIN32_WCE_EMULATION)
-    /* Only the first 32 MB of address space belongs to the current process */
-    while (p < (LPVOID)0x02000000) {
-        result = VirtualQuery(p, &buf, sizeof(buf));
-	if (result == 0) {
-	    /* Page is free; advance to the next possible allocation base */
-	    new_limit = (char *)
-		(((DWORD) p + GC_sysinfo.dwAllocationGranularity)
-		 & ~(GC_sysinfo.dwAllocationGranularity-1));
-	} else
-#   else
-    while (p < GC_sysinfo.lpMaximumApplicationAddress) {
-        result = VirtualQuery(p, &buf, sizeof(buf));
-#   endif
-	{
-	    if (result != sizeof(buf)) {
-		ABORT("Weird VirtualQuery result");
-	    }
-	    new_limit = (char *)p + buf.RegionSize;
-	    protect = buf.Protect;
-	    if (buf.State == MEM_COMMIT
-		&& (protect == PAGE_EXECUTE_READWRITE
-		    || protect == PAGE_READWRITE)
-		&& !GC_is_heap_base(buf.AllocationBase)
-		/* This used to check for
-		 * !is_frame_buffer(p, buf.RegionSize, buf.Type)
-		 * instead of just checking for MEM_IMAGE.
-		 * If something breaks, change it back. */
-		/* There is some evidence that we cannot always
-		 * ignore MEM_PRIVATE sections under Windows ME
-		 * and predecessors.  Hence we now also check for
-		 * that case.	*/
-		&& (buf.Type == MEM_IMAGE ||
-		    !GC_wnt && buf.Type == MEM_PRIVATE)) {  
-#	        ifdef DEBUG_VIRTUALQUERY
-	          GC_dump_meminfo(&buf);
-#	        endif
-		if ((char *)p != limit) {
-		    GC_cond_add_roots(base, limit);
-		    base = p;
-		}
-		limit = new_limit;
-	    }
-	}
-        if (p > (LPVOID)new_limit /* overflow */) break;
-        p = (LPVOID)new_limit;
-    }
-    GC_cond_add_roots(base, limit);
-  }
-
-#endif /* MSWIN32 || MSWINCE || CYGWIN32 */
-  
-#if defined(ALPHA) && defined(OSF1)
-
-#include <loader.h>
-
-void GC_register_dynamic_libraries()
-{
-  int status;
-  ldr_process_t mypid;
-
-  /* module */
-    ldr_module_t moduleid = LDR_NULL_MODULE;
-    ldr_module_info_t moduleinfo;
-    size_t moduleinfosize = sizeof(moduleinfo);
-    size_t modulereturnsize;    
-
-  /* region */
-    ldr_region_t region; 
-    ldr_region_info_t regioninfo;
-    size_t regioninfosize = sizeof(regioninfo);
-    size_t regionreturnsize;
-
-  /* Obtain id of this process */
-    mypid = ldr_my_process();
-  
-  /* For each module */
-    while (TRUE) {
-
-      /* Get the next (first) module */
-        status = ldr_next_module(mypid, &moduleid);
-
-      /* Any more modules? */
-        if (moduleid == LDR_NULL_MODULE)
-            break;    /* No more modules */
-
-      /* Check status AFTER checking moduleid because */
-      /* of a bug in the non-shared ldr_next_module stub */
-        if (status != 0 ) {
-            GC_printf1("dynamic_load: status = %ld\n", (long)status);
-            {
-                extern char *sys_errlist[];
-                extern int sys_nerr;
-                extern int errno;
-                if (errno <= sys_nerr) {
-                    GC_printf1("dynamic_load: %s\n", (long)sys_errlist[errno]);
-               } else {
-                    GC_printf1("dynamic_load: %d\n", (long)errno);
-                }
-        }
-            ABORT("ldr_next_module failed");
-         }
-
-      /* Get the module information */
-        status = ldr_inq_module(mypid, moduleid, &moduleinfo,
-                                moduleinfosize, &modulereturnsize); 
-        if (status != 0 )
-            ABORT("ldr_inq_module failed");
-
-      /* is module for the main program (i.e. nonshared portion)? */
-          if (moduleinfo.lmi_flags & LDR_MAIN)
-              continue;    /* skip the main module */
-
-#     ifdef VERBOSE
-          GC_printf("---Module---\n");
-          GC_printf("Module ID            = %16ld\n", moduleinfo.lmi_modid);
-          GC_printf("Count of regions     = %16d\n", moduleinfo.lmi_nregion);
-          GC_printf("flags for module     = %16lx\n", moduleinfo.lmi_flags); 
-          GC_printf("pathname of module   = \"%s\"\n", moduleinfo.lmi_name);
-#     endif
-
-      /* For each region in this module */
-        for (region = 0; region < moduleinfo.lmi_nregion; region++) {
-
-          /* Get the region information */
-            status = ldr_inq_region(mypid, moduleid, region, &regioninfo,
-                                    regioninfosize, &regionreturnsize);
-            if (status != 0 )
-                ABORT("ldr_inq_region failed");
-
-          /* only process writable (data) regions */
-            if (! (regioninfo.lri_prot & LDR_W))
-                continue;
-
-#         ifdef VERBOSE
-              GC_printf("--- Region ---\n");
-              GC_printf("Region number    = %16ld\n",
-              	        regioninfo.lri_region_no);
-              GC_printf("Protection flags = %016x\n",  regioninfo.lri_prot);
-              GC_printf("Virtual address  = %16p\n",   regioninfo.lri_vaddr);
-              GC_printf("Mapped address   = %16p\n",   regioninfo.lri_mapaddr);
-              GC_printf("Region size      = %16ld\n",  regioninfo.lri_size);
-              GC_printf("Region name      = \"%s\"\n", regioninfo.lri_name);
-#         endif
-
-          /* register region as a garbage collection root */
-            GC_add_roots_inner (
-                (char *)regioninfo.lri_mapaddr,
-                (char *)regioninfo.lri_mapaddr + regioninfo.lri_size,
-                TRUE);
-
-        }
-    }
-}
-#endif
-
-#if defined(HPUX)
-
-#include <errno.h>
-#include <dl.h>
-
-extern int errno;
-extern char *sys_errlist[];
-extern int sys_nerr;
-
-void GC_register_dynamic_libraries()
-{
-  int status;
-  int index = 1; /* Ordinal position in shared library search list */
-  struct shl_descriptor *shl_desc; /* Shared library info, see dl.h */
-
-  /* For each dynamic library loaded */
-    while (TRUE) {
-
-      /* Get info about next shared library */
-        status = shl_get(index, &shl_desc);
-
-      /* Check if this is the end of the list or if some error occured */
-        if (status != 0) {
-#	 ifdef GC_HPUX_THREADS
-	   /* I've seen errno values of 0.  The man page is not clear	*/
-	   /* as to whether errno should get set on a -1 return.	*/
-	   break;
-#	 else
-          if (errno == EINVAL) {
-              break; /* Moved past end of shared library list --> finished */
-          } else {
-              if (errno <= sys_nerr) {
-                    GC_printf1("dynamic_load: %s\n", (long) sys_errlist[errno]);
-              } else {
-                    GC_printf1("dynamic_load: %d\n", (long) errno);
-	      }
-              ABORT("shl_get failed");
-          }
-#	 endif
-        }
-
-#     ifdef VERBOSE
-          GC_printf0("---Shared library---\n");
-          GC_printf1("\tfilename        = \"%s\"\n", shl_desc->filename);
-          GC_printf1("\tindex           = %d\n", index);
-          GC_printf1("\thandle          = %08x\n",
-					(unsigned long) shl_desc->handle);
-          GC_printf1("\ttext seg. start = %08x\n", shl_desc->tstart);
-          GC_printf1("\ttext seg. end   = %08x\n", shl_desc->tend);
-          GC_printf1("\tdata seg. start = %08x\n", shl_desc->dstart);
-          GC_printf1("\tdata seg. end   = %08x\n", shl_desc->dend);
-          GC_printf1("\tref. count      = %lu\n", shl_desc->ref_count);
-#     endif
-
-      /* register shared library's data segment as a garbage collection root */
-        GC_add_roots_inner((char *) shl_desc->dstart,
-			   (char *) shl_desc->dend, TRUE);
-
-        index++;
-    }
-}
-#endif /* HPUX */
-
-#ifdef RS6000
-#pragma alloca
-#include <sys/ldr.h>
-#include <sys/errno.h>
-void GC_register_dynamic_libraries()
-{
-	int len;
-	char *ldibuf;
-	int ldibuflen;
-	struct ld_info *ldi;
-
-	ldibuf = alloca(ldibuflen = 8192);
-
-	while ( (len = loadquery(L_GETINFO,ldibuf,ldibuflen)) < 0) {
-		if (errno != ENOMEM) {
-			ABORT("loadquery failed");
-		}
-		ldibuf = alloca(ldibuflen *= 2);
-	}
-
-	ldi = (struct ld_info *)ldibuf;
-	while (ldi) {
-		len = ldi->ldinfo_next;
-		GC_add_roots_inner(
-				ldi->ldinfo_dataorg,
-				(ptr_t)(unsigned long)ldi->ldinfo_dataorg
-			        + ldi->ldinfo_datasize,
-				TRUE);
-		ldi = len ? (struct ld_info *)((char *)ldi + len) : 0;
-	}
-}
-#endif /* RS6000 */
-
-#ifdef DARWIN
-
-/* __private_extern__ hack required for pre-3.4 gcc versions.	*/
-#ifndef __private_extern__
-# define __private_extern__ extern
-# include <mach-o/dyld.h>
-# undef __private_extern__
-#else
-# include <mach-o/dyld.h>
-#endif
-#include <mach-o/getsect.h>
-
-/*#define DARWIN_DEBUG*/
-
-/* Writeable sections generally available on Darwin.  */
-const static struct { 
-        const char *seg;
-        const char *sect;
-} GC_dyld_sections[] = {
-        { SEG_DATA, SECT_DATA },
-        /* Used by FSF GCC, but not by OSX system tools, so far.  */
-        { SEG_DATA, "__static_data" }, 
-        { SEG_DATA, SECT_BSS },
-        { SEG_DATA, SECT_COMMON },
-        /* FSF GCC - zero-sized object sections for targets supporting section
-           anchors.  */
-        { SEG_DATA, "__zobj_data" },
-        { SEG_DATA, "__zobj_bss" }
-};
-
-/* Additional writeable sections:
-
-   GCC on Darwin constucts aligned sections "on demand", where the alignment
-   size is embedded in the section name.  Furthermore, there are distintions
-   between sections containing private vs. public symbols.
-
-   It also constructs sections specifically for zero-sized objects, when the
-   target supports section anchors.  */
-const char * GC_dyld_add_sect_fmts[] = 
-{
-  "__bss%u",
-  "__pu_bss%u",
-  "__zo_bss%u",
-  "__zo_pu_bss%u",
-  NULL
-} ;
-
-/* Currently, mach-o will allow up to a max of 2^15 alignment in an
-   object file.  */
-#define L2_MAX_OFILE_ALIGNMENT 15
-
-  
-#ifdef DARWIN_DEBUG
-static const char *
-GC_dyld_name_for_hdr (const struct GC_MACH_HEADER *hdr)
-{
-  unsigned long i,c;
-  c = _dyld_image_count();
-  for (i=0;i<c;i++) 
-    if(_dyld_get_image_header(i) == hdr)
-      return _dyld_get_image_name(i);
-  return NULL;
-}
-#endif
-
-
-/* This should never be called by a thread holding the lock */
-static void 
-GC_dyld_image_add (const struct GC_MACH_HEADER *hdr, intptr_t slide)
-{
-  char secnam[16];
-  unsigned long start,end,i,j;
-  const struct GC_MACH_SECTION *sec;
-  const char *fmt;
-
-  if (GC_no_dls)
-    return;
-
-  for (i=0; i<sizeof(GC_dyld_sections)/sizeof(GC_dyld_sections[0]); i++)
-    {
-      sec = GC_GETSECTBYNAME (hdr, GC_dyld_sections[i].seg,
-			      GC_dyld_sections[i].sect);
-      if(sec == NULL || sec->size == 0)
-	continue;
-
-      start = slide + sec->addr;
-      end = start + sec->size;
-
-#     ifdef DARWIN_DEBUG
-      GC_printf5("Adding section __DATA,%s at %p-%p (%lu bytes) from image %s\n",
-                GC_dyld_sections[i].sect, start,end,sec->size,GC_dyld_name_for_hdr(hdr));
-#      endif
-      GC_add_roots((char*)start,(char*)end);
-    }
-
-  /* Sections constructed on demand.  */
-  j=0;
-  while ((fmt = GC_dyld_add_sect_fmts[j]) != NULL)
-    {
-      /* Add our manufactured aligned BSS sections.  */
-      for (i=0; i<=L2_MAX_OFILE_ALIGNMENT; i++)
-	{
-	  snprintf (secnam, 16, fmt, (unsigned)i);
-	  sec = GC_GETSECTBYNAME (hdr, SEG_DATA, secnam);
-	  if (sec == NULL || sec->size == 0)
-	    continue;
-	  start = slide + sec->addr;
-	  end = start + sec->size;
-#	  ifdef DARWIN_DEBUG
-	  GC_printf5("Adding section __DATA,%s at %p-%p (%lu bytes) from image %s\n",
-		 secnam, start,end,sec->size,GC_dyld_name_for_hdr(hdr));
-#	  endif
-	  GC_add_roots((char*)start,(char*)end);
-	}
-      j++;
-    } 
-# ifdef DARWIN_DEBUG
-  GC_print_static_roots();
-# endif
-}
-
-/* This should never be called by a thread holding the lock */
-static void 
-GC_dyld_image_remove (const struct GC_MACH_HEADER *hdr, intptr_t slide)
-{
-  char secnam[16];
-  unsigned long start,end,i,j;
-  const struct GC_MACH_SECTION *sec;
-  const char *fmt;
-
-  for (i=0; i<sizeof(GC_dyld_sections)/sizeof(GC_dyld_sections[0]); i++)
-    {
-      sec = GC_GETSECTBYNAME (hdr, GC_dyld_sections[i].seg,
-			      GC_dyld_sections[i].sect);
-      if(sec == NULL || sec->size == 0)
-	continue;
-
-      start = slide + sec->addr;
-      end = start + sec->size;
-#     ifdef DARWIN_DEBUG
-      GC_printf5("Removing section __DATA,%s at %p-%p (%lu bytes) from image %s\n",
-                  GC_dyld_sections[i].sect, start,end,sec->size,GC_dyld_name_for_hdr(hdr));
-#      endif
-      GC_remove_roots((char*)start,(char*)end);
-    }
-
-  /* Remove our on-demand sections.  */
-  j=0;
-  while ((fmt = GC_dyld_add_sect_fmts[j]) != NULL)
-    {
-      for (i=0; i<=L2_MAX_OFILE_ALIGNMENT; i++)
-	{
-	  snprintf (secnam, 16, fmt, (unsigned)i);
-	  sec = GC_GETSECTBYNAME (hdr, SEG_DATA, secnam);
-	  if (sec == NULL || sec->size == 0)
-	    continue;
-	  start = slide + sec->addr;
-	  end = start + sec->size;
-#	  ifdef DARWIN_DEBUG
-	  GC_printf5("Removing section __DATA,%s at %p-%p (%lu bytes) from image %s\n",
-		      secnam, start,end,sec->size,GC_dyld_name_for_hdr(hdr));
-#	  endif
-	  GC_remove_roots((char*)start,(char*)end);
-	}
-      j++;
-    }
-
-# ifdef DARWIN_DEBUG
-  GC_print_static_roots();
-# endif
-}
-
-void 
-GC_register_dynamic_libraries() 
-{
-    /* Currently does nothing. The callbacks are setup by GC_init_dyld() 
-    The dyld library takes it from there. */
-}
-
-/* The _dyld_* functions have an internal lock so no _dyld functions
-   can be called while the world is stopped without the risk of a deadlock.
-   Because of this we MUST setup callbacks BEFORE we ever stop the world.
-   This should be called BEFORE any thread in created and WITHOUT the
-   allocation lock held. */
-   
-void 
-GC_init_dyld()
-{
-  static GC_bool initialized = FALSE;
-  char *bind_fully_env = NULL;
-  
-  if(initialized)
-    return;
-  
-# ifdef DARWIN_DEBUG
-  GC_printf0("Registering dyld callbacks...\n");
-# endif
-  
-  /* Apple's Documentation:
-     When you call _dyld_register_func_for_add_image, the dynamic linker runtime
-     calls the specified callback (func) once for each of the images that is
-     currently loaded into the program. When a new image is added to the program,
-     your callback is called again with the mach_header for the new image, and the 	
-     virtual memory slide amount of the new image. 
-     
-     This WILL properly register already linked libraries and libraries 
-     linked in the future
-  */
-  
-  _dyld_register_func_for_add_image(GC_dyld_image_add);
-  _dyld_register_func_for_remove_image(GC_dyld_image_remove);
-
-  /* Set this early to avoid reentrancy issues. */
-  initialized = TRUE;
-
-  bind_fully_env = getenv("DYLD_BIND_AT_LAUNCH");
-    
-  if (bind_fully_env == NULL)
-    {
-#     ifdef DARWIN_DEBUG
-      GC_printf0("Forcing full bind of GC code...\n");
-#     endif
-      
-      if (!_dyld_bind_fully_image_containing_address((unsigned long*)GC_malloc))
-	GC_abort("_dyld_bind_fully_image_containing_address failed");
-    }
-}
-
-#define HAVE_REGISTER_MAIN_STATIC_DATA
-GC_bool 
-GC_register_main_static_data (void)
-{
-  /* Already done through dyld callbacks */
-  return FALSE;
-}
-
-#endif /* DARWIN */
-
-#else /* !DYNAMIC_LOADING */
-
-#ifdef PCR
-
-#   include "il/PCR_IL.h"
-#   include "th/PCR_ThCtl.h"
-#   include "mm/PCR_MM.h"
-
-void GC_register_dynamic_libraries()
-{
-    /* Add new static data areas of dynamically loaded modules.	*/
-        {
-          PCR_IL_LoadedFile * p = PCR_IL_GetLastLoadedFile();
-          PCR_IL_LoadedSegment * q;
-          
-          /* Skip uncommited files */
-          while (p != NIL && !(p -> lf_commitPoint)) {
-              /* The loading of this file has not yet been committed	*/
-              /* Hence its description could be inconsistent.  		*/
-              /* Furthermore, it hasn't yet been run.  Hence its data	*/
-              /* segments can't possibly reference heap allocated	*/
-              /* objects.						*/
-              p = p -> lf_prev;
-          }
-          for (; p != NIL; p = p -> lf_prev) {
-            for (q = p -> lf_ls; q != NIL; q = q -> ls_next) {
-              if ((q -> ls_flags & PCR_IL_SegFlags_Traced_MASK)
-                  == PCR_IL_SegFlags_Traced_on) {
-                GC_add_roots_inner
-                	((char *)(q -> ls_addr), 
-                	 (char *)(q -> ls_addr) + q -> ls_bytes,
-                	 TRUE);
-              }
-            }
-          }
-        }
-}
-
-
-#else /* !PCR */
-
-void GC_register_dynamic_libraries(){}
-
-int GC_no_dynamic_loading;
-
-#endif /* !PCR */
-
-#endif /* !DYNAMIC_LOADING */
-
-#ifndef HAVE_REGISTER_MAIN_STATIC_DATA
-
-/* Do we need to separately register the main static data segment? */
-GC_bool GC_register_main_static_data()
-{
-  return TRUE;
-}
-#endif /* HAVE_REGISTER_MAIN_STATIC_DATA */
-
diff --git a/boehm-gc/finalize.c b/boehm-gc/finalize.c
deleted file mode 100644
index 484d421d1d6..00000000000
--- a/boehm-gc/finalize.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (C) 2007 Free Software Foundation, Inc
-
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, February 1, 1996 1:19 pm PST */
-# define I_HIDE_POINTERS
-# include "private/gc_pmark.h"
-
-# ifdef FINALIZE_ON_DEMAND
-    int GC_finalize_on_demand = 1;
-# else
-    int GC_finalize_on_demand = 0;
-# endif
-
-# ifdef JAVA_FINALIZATION
-    int GC_java_finalization = 1;
-# else
-    int GC_java_finalization = 0;
-# endif
-
-/* Type of mark procedure used for marking from finalizable object.	*/
-/* This procedure normally does not mark the object, only its		*/
-/* descendents.								*/
-typedef void finalization_mark_proc(/* ptr_t finalizable_obj_ptr */); 
-
-# define HASH3(addr,size,log_size) \
-    ((((word)(addr) >> 3) ^ ((word)(addr) >> (3+(log_size)))) \
-    & ((size) - 1))
-#define HASH2(addr,log_size) HASH3(addr, 1 << log_size, log_size)
-
-struct hash_chain_entry {
-    word hidden_key;
-    struct hash_chain_entry * next;
-};
-
-unsigned GC_finalization_failures = 0;
-	/* Number of finalization requests that failed for lack of memory. */
-
-static struct disappearing_link {
-    struct hash_chain_entry prolog;
-#   define dl_hidden_link prolog.hidden_key
-				/* Field to be cleared.		*/
-#   define dl_next(x) (struct disappearing_link *)((x) -> prolog.next)
-#   define dl_set_next(x,y) (x) -> prolog.next = (struct hash_chain_entry *)(y)
-
-    word dl_hidden_obj;		/* Pointer to object base	*/
-} **dl_head = 0;
-
-static signed_word log_dl_table_size = -1;
-			/* Binary log of				*/
-			/* current size of array pointed to by dl_head.	*/
-			/* -1 ==> size is 0.				*/
-
-word GC_dl_entries = 0;	/* Number of entries currently in disappearing	*/
-			/* link table.					*/
-
-static struct finalizable_object {
-    struct hash_chain_entry prolog;
-#   define fo_hidden_base prolog.hidden_key
-				/* Pointer to object base.	*/
-				/* No longer hidden once object */
-				/* is on finalize_now queue.	*/
-#   define fo_next(x) (struct finalizable_object *)((x) -> prolog.next)
-#   define fo_set_next(x,y) (x) -> prolog.next = (struct hash_chain_entry *)(y)
-    GC_finalization_proc fo_fn;	/* Finalizer.			*/
-    ptr_t fo_client_data;
-    word fo_object_size;	/* In bytes.			*/
-    finalization_mark_proc * fo_mark_proc;	/* Mark-through procedure */
-} **fo_head = 0;
-
-struct finalizable_object * GC_finalize_now = 0;
-	/* LIst of objects that should be finalized now.	*/
-
-static signed_word log_fo_table_size = -1;
-
-word GC_fo_entries = 0;
-
-void GC_push_finalizer_structures GC_PROTO((void))
-{
-    GC_push_all((ptr_t)(&dl_head), (ptr_t)(&dl_head) + sizeof(word));
-    GC_push_all((ptr_t)(&fo_head), (ptr_t)(&fo_head) + sizeof(word));
-    GC_push_all((ptr_t)(&GC_finalize_now),
-		(ptr_t)(&GC_finalize_now) + sizeof(word));
-}
-
-/* Double the size of a hash table. *size_ptr is the log of its current	*/
-/* size.  May be a noop.						*/
-/* *table is a pointer to an array of hash headers.  If we succeed, we	*/
-/* update both *table and *log_size_ptr.				*/
-/* Lock is held.  Signals are disabled.					*/
-void GC_grow_table(table, log_size_ptr)
-struct hash_chain_entry ***table;
-signed_word * log_size_ptr;
-{
-    register word i;
-    register struct hash_chain_entry *p;
-    int log_old_size = *log_size_ptr;
-    register int log_new_size = log_old_size + 1;
-    word old_size = ((log_old_size == -1)? 0: (1 << log_old_size));
-    register word new_size = 1 << log_new_size;
-    struct hash_chain_entry **new_table = (struct hash_chain_entry **)
-    	GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE(
-    		(size_t)new_size * sizeof(struct hash_chain_entry *), NORMAL);
-    
-    if (new_table == 0) {
-    	if (table == 0) {
-    	    ABORT("Insufficient space for initial table allocation");
-    	} else {
-    	    return;
-    	}
-    }
-    for (i = 0; i < old_size; i++) {
-      p = (*table)[i];
-      while (p != 0) {
-        register ptr_t real_key = (ptr_t)REVEAL_POINTER(p -> hidden_key);
-        register struct hash_chain_entry *next = p -> next;
-        register int new_hash = HASH3(real_key, new_size, log_new_size);
-        
-        p -> next = new_table[new_hash];
-        new_table[new_hash] = p;
-        p = next;
-      }
-    }
-    *log_size_ptr = log_new_size;
-    *table = new_table;
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    int GC_register_disappearing_link(GC_PTR * link)
-# else
-    int GC_register_disappearing_link(link)
-    GC_PTR * link;
-# endif
-{
-    ptr_t base;
-    
-    base = (ptr_t)GC_base((GC_PTR)link);
-    if (base == 0)
-    	ABORT("Bad arg to GC_register_disappearing_link");
-    return(GC_general_register_disappearing_link(link, base));
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    int GC_general_register_disappearing_link(GC_PTR * link,
-    					      GC_PTR obj)
-# else
-    int GC_general_register_disappearing_link(link, obj)
-    GC_PTR * link;
-    GC_PTR obj;
-# endif
-
-{
-    struct disappearing_link *curr_dl;
-    int index;
-    struct disappearing_link * new_dl;
-    DCL_LOCK_STATE;
-    
-    if ((word)link & (ALIGNMENT-1))
-    	ABORT("Bad arg to GC_general_register_disappearing_link");
-#   ifdef THREADS
-    	DISABLE_SIGNALS();
-    	LOCK();
-#   endif
-    if (log_dl_table_size == -1
-        || GC_dl_entries > ((word)1 << log_dl_table_size)) {
-#	ifndef THREADS
-	    DISABLE_SIGNALS();
-#	endif
-    	GC_grow_table((struct hash_chain_entry ***)(&dl_head),
-    		      &log_dl_table_size);
-#	ifdef CONDPRINT
-	  if (GC_print_stats) {
-	    GC_printf1("Grew dl table to %lu entries\n",
-	    		(unsigned long)(1 << log_dl_table_size));
-	  }
-#	endif
-#	ifndef THREADS
-	    ENABLE_SIGNALS();
-#	endif
-    }
-    index = HASH2(link, log_dl_table_size);
-    curr_dl = dl_head[index];
-    for (curr_dl = dl_head[index]; curr_dl != 0; curr_dl = dl_next(curr_dl)) {
-        if (curr_dl -> dl_hidden_link == HIDE_POINTER(link)) {
-            curr_dl -> dl_hidden_obj = HIDE_POINTER(obj);
-#	    ifdef THREADS
-                UNLOCK();
-    	        ENABLE_SIGNALS();
-#	    endif
-            return(1);
-        }
-    }
-    new_dl = (struct disappearing_link *)
-    	GC_INTERNAL_MALLOC(sizeof(struct disappearing_link),NORMAL);
-    if (0 == new_dl) {
-#     ifdef THREADS
-	UNLOCK();
-    	ENABLE_SIGNALS();
-#     endif
-      new_dl = (struct disappearing_link *)
-	      GC_oom_fn(sizeof(struct disappearing_link));
-      if (0 == new_dl) {
-	GC_finalization_failures++;
-	return(0);
-      }
-      /* It's not likely we'll make it here, but ... */
-#     ifdef THREADS
-        DISABLE_SIGNALS();
-	LOCK();
-#     endif
-    }
-    new_dl -> dl_hidden_obj = HIDE_POINTER(obj);
-    new_dl -> dl_hidden_link = HIDE_POINTER(link);
-    dl_set_next(new_dl, dl_head[index]);
-    dl_head[index] = new_dl;
-    GC_dl_entries++;
-#   ifdef THREADS
-        UNLOCK();
-        ENABLE_SIGNALS();
-#   endif
-    return(0);
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    int GC_unregister_disappearing_link(GC_PTR * link)
-# else
-    int GC_unregister_disappearing_link(link)
-    GC_PTR * link;
-# endif
-{
-    struct disappearing_link *curr_dl, *prev_dl;
-    int index;
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    index = HASH2(link, log_dl_table_size);
-    if (((unsigned long)link & (ALIGNMENT-1))) goto out;
-    prev_dl = 0; curr_dl = dl_head[index];
-    while (curr_dl != 0) {
-        if (curr_dl -> dl_hidden_link == HIDE_POINTER(link)) {
-            if (prev_dl == 0) {
-                dl_head[index] = dl_next(curr_dl);
-            } else {
-                dl_set_next(prev_dl, dl_next(curr_dl));
-            }
-            GC_dl_entries--;
-            UNLOCK();
-    	    ENABLE_SIGNALS();
-#	    ifdef DBG_HDRS_ALL
-	      dl_set_next(curr_dl, 0);
-#	    else
-              GC_free((GC_PTR)curr_dl);
-#	    endif
-            return(1);
-        }
-        prev_dl = curr_dl;
-        curr_dl = dl_next(curr_dl);
-    }
-out:
-    UNLOCK();
-    ENABLE_SIGNALS();
-    return(0);
-}
-
-/* Possible finalization_marker procedures.  Note that mark stack	*/
-/* overflow is handled by the caller, and is not a disaster.		*/
-GC_API void GC_normal_finalize_mark_proc(p)
-ptr_t p;
-{
-    hdr * hhdr = HDR(p);
-    
-    PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top,
-	     &(GC_mark_stack[GC_mark_stack_size]));
-}
-
-/* This only pays very partial attention to the mark descriptor.	*/
-/* It does the right thing for normal and atomic objects, and treats	*/
-/* most others as normal.						*/
-GC_API void GC_ignore_self_finalize_mark_proc(p)
-ptr_t p;
-{
-    hdr * hhdr = HDR(p);
-    word descr = hhdr -> hb_descr;
-    ptr_t q, r;
-    ptr_t scan_limit;
-    ptr_t target_limit = p + WORDS_TO_BYTES(hhdr -> hb_sz) - 1;
-    
-    if ((descr & GC_DS_TAGS) == GC_DS_LENGTH) {
-       scan_limit = p + descr - sizeof(word);
-    } else {
-       scan_limit = target_limit + 1 - sizeof(word);
-    }
-    for (q = p; q <= scan_limit; q += ALIGNMENT) {
-    	r = *(ptr_t *)q;
-    	if (r < p || r > target_limit) {
-    	    GC_PUSH_ONE_HEAP((word)r, q);
-    	}
-    }
-}
-
-/*ARGSUSED*/
-GC_API void GC_null_finalize_mark_proc(p)
-ptr_t p;
-{
-}
-
-/* Possible finalization_marker procedures.  Note that mark stack	*/
-/* overflow is handled by the caller, and is not a disaster.		*/
-GC_API void GC_unreachable_finalize_mark_proc(p)
-ptr_t p;
-{
-    return GC_normal_finalize_mark_proc(p);
-}
-
-
-
-/* Register a finalization function.  See gc.h for details.	*/
-/* in the nonthreads case, we try to avoid disabling signals,	*/
-/* since it can be expensive.  Threads packages typically	*/
-/* make it cheaper.						*/
-/* The last parameter is a procedure that determines		*/
-/* marking for finalization ordering.  Any objects marked	*/
-/* by that procedure will be guaranteed to not have been	*/
-/* finalized when this finalizer is invoked.			*/
-GC_API void GC_register_finalizer_inner(obj, fn, cd, ofn, ocd, mp)
-GC_PTR obj;
-GC_finalization_proc fn;
-GC_PTR cd;
-GC_finalization_proc * ofn;
-GC_PTR * ocd;
-finalization_mark_proc * mp;
-{
-    ptr_t base;
-    struct finalizable_object * curr_fo, * prev_fo;
-    int index;
-    struct finalizable_object *new_fo;
-    hdr *hhdr;
-    DCL_LOCK_STATE;
-
-#   ifdef THREADS
-	DISABLE_SIGNALS();
-	LOCK();
-#   endif
-    if (log_fo_table_size == -1
-        || GC_fo_entries > ((word)1 << log_fo_table_size)) {
-#	ifndef THREADS
-    	    DISABLE_SIGNALS();
-#	endif
-    	GC_grow_table((struct hash_chain_entry ***)(&fo_head),
-    		      &log_fo_table_size);
-#	ifdef CONDPRINT
-	  if (GC_print_stats) {
-	    GC_printf1("Grew fo table to %lu entries\n",
-	    		(unsigned long)(1 << log_fo_table_size));
-	  }
-#	endif
-#	ifndef THREADS
-	    ENABLE_SIGNALS();
-#	endif
-    }
-    /* in the THREADS case signals are disabled and we hold allocation	*/
-    /* lock; otherwise neither is true.  Proceed carefully.		*/
-    base = (ptr_t)obj;
-    index = HASH2(base, log_fo_table_size);
-    prev_fo = 0; curr_fo = fo_head[index];
-    while (curr_fo != 0) {
-        if (curr_fo -> fo_hidden_base == HIDE_POINTER(base)) {
-            /* Interruption by a signal in the middle of this	*/
-            /* should be safe.  The client may see only *ocd	*/
-            /* updated, but we'll declare that to be his	*/
-            /* problem.						*/
-            if (ocd) *ocd = (GC_PTR) curr_fo -> fo_client_data;
-            if (ofn) *ofn = curr_fo -> fo_fn;
-            /* Delete the structure for base. */
-                if (prev_fo == 0) {
-                  fo_head[index] = fo_next(curr_fo);
-                } else {
-                  fo_set_next(prev_fo, fo_next(curr_fo));
-                }
-            if (fn == 0) {
-                GC_fo_entries--;
-                  /* May not happen if we get a signal.  But a high	*/
-                  /* estimate will only make the table larger than	*/
-                  /* necessary.						*/
-#		if !defined(THREADS) && !defined(DBG_HDRS_ALL)
-                  GC_free((GC_PTR)curr_fo);
-#		endif
-            } else {
-                curr_fo -> fo_fn = fn;
-                curr_fo -> fo_client_data = (ptr_t)cd;
-                curr_fo -> fo_mark_proc = mp;
-		/* Reinsert it.  We deleted it first to maintain	*/
-		/* consistency in the event of a signal.		*/
-		if (prev_fo == 0) {
-                  fo_head[index] = curr_fo;
-                } else {
-                  fo_set_next(prev_fo, curr_fo);
-                }
-            }
-#	    ifdef THREADS
-                UNLOCK();
-    	    	ENABLE_SIGNALS();
-#	    endif
-            return;
-        }
-        prev_fo = curr_fo;
-        curr_fo = fo_next(curr_fo);
-    }
-    if (ofn) *ofn = 0;
-    if (ocd) *ocd = 0;
-    if (fn == 0) {
-#	ifdef THREADS
-            UNLOCK();
-    	    ENABLE_SIGNALS();
-#	endif
-        return;
-    }
-    GET_HDR(base, hhdr);
-    if (0 == hhdr) {
-      /* We won't collect it, hence finalizer wouldn't be run. */
-#     ifdef THREADS
-          UNLOCK();
-    	  ENABLE_SIGNALS();
-#     endif
-      return;
-    }
-    new_fo = (struct finalizable_object *)
-    	GC_INTERNAL_MALLOC(sizeof(struct finalizable_object),NORMAL);
-    if (0 == new_fo) {
-#     ifdef THREADS
-	UNLOCK();
-    	ENABLE_SIGNALS();
-#     endif
-      new_fo = (struct finalizable_object *)
-	      GC_oom_fn(sizeof(struct finalizable_object));
-      if (0 == new_fo) {
-	GC_finalization_failures++;
-	return;
-      }
-      /* It's not likely we'll make it here, but ... */
-#     ifdef THREADS
-        DISABLE_SIGNALS();
-	LOCK();
-#     endif
-    }
-    new_fo -> fo_hidden_base = (word)HIDE_POINTER(base);
-    new_fo -> fo_fn = fn;
-    new_fo -> fo_client_data = (ptr_t)cd;
-    new_fo -> fo_object_size = hhdr -> hb_sz;
-    new_fo -> fo_mark_proc = mp;
-    fo_set_next(new_fo, fo_head[index]);
-    GC_fo_entries++;
-    fo_head[index] = new_fo;
-#   ifdef THREADS
-        UNLOCK();
-    	ENABLE_SIGNALS();
-#   endif
-}
-
-# if defined(__STDC__)
-    void GC_register_finalizer(void * obj,
-			       GC_finalization_proc fn, void * cd,
-			       GC_finalization_proc *ofn, void ** ocd)
-# else
-    void GC_register_finalizer(obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc * ofn;
-    GC_PTR * ocd;
-# endif
-{
-    GC_register_finalizer_inner(obj, fn, cd, ofn,
-    				ocd, GC_normal_finalize_mark_proc);
-}
-
-# if defined(__STDC__)
-    void GC_register_finalizer_ignore_self(void * obj,
-			       GC_finalization_proc fn, void * cd,
-			       GC_finalization_proc *ofn, void ** ocd)
-# else
-    void GC_register_finalizer_ignore_self(obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc * ofn;
-    GC_PTR * ocd;
-# endif
-{
-    GC_register_finalizer_inner(obj, fn, cd, ofn,
-    				ocd, GC_ignore_self_finalize_mark_proc);
-}
-
-# if defined(__STDC__)
-    void GC_register_finalizer_no_order(void * obj,
-			       GC_finalization_proc fn, void * cd,
-			       GC_finalization_proc *ofn, void ** ocd)
-# else
-    void GC_register_finalizer_no_order(obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc * ofn;
-    GC_PTR * ocd;
-# endif
-{
-    GC_register_finalizer_inner(obj, fn, cd, ofn,
-    				ocd, GC_null_finalize_mark_proc);
-}
-
-# if defined(__STDC__)
-    void GC_register_finalizer_unreachable(void * obj,
-			       GC_finalization_proc fn, void * cd,
-			       GC_finalization_proc *ofn, void ** ocd)
-# else
-    void GC_register_finalizer_unreachable(obj, fn, cd, ofn, ocd)
-    GC_PTR obj;
-    GC_finalization_proc fn;
-    GC_PTR cd;
-    GC_finalization_proc * ofn;
-    GC_PTR * ocd;
-# endif
-{
-    GC_register_finalizer_inner(obj, fn, cd, ofn,
-    				ocd, GC_unreachable_finalize_mark_proc);
-}
-
-#ifndef NO_DEBUGGING
-void GC_dump_finalization()
-{
-    struct disappearing_link * curr_dl;
-    struct finalizable_object * curr_fo;
-    ptr_t real_ptr, real_link;
-    int dl_size = (log_dl_table_size == -1 ) ? 0 : (1 << log_dl_table_size);
-    int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
-    int i;
-
-    GC_printf0("Disappearing links:\n");
-    for (i = 0; i < dl_size; i++) {
-      for (curr_dl = dl_head[i]; curr_dl != 0; curr_dl = dl_next(curr_dl)) {
-        real_ptr = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_obj);
-        real_link = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_link);
-        GC_printf2("Object: 0x%lx, Link:0x%lx\n", real_ptr, real_link);
-      }
-    }
-    GC_printf0("Finalizers:\n");
-    for (i = 0; i < fo_size; i++) {
-      for (curr_fo = fo_head[i]; curr_fo != 0; curr_fo = fo_next(curr_fo)) {
-        real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
-        GC_printf1("Finalizable object: 0x%lx\n", real_ptr);
-      }
-    }
-}
-#endif
-
-/* Called with world stopped.  Cause disappearing links to disappear,	*/
-/* and invoke finalizers.						*/
-void GC_finalize()
-{
-    struct disappearing_link * curr_dl, * prev_dl, * next_dl;
-    struct finalizable_object * curr_fo, * prev_fo, * next_fo;
-    ptr_t real_ptr, real_link;
-    register int i;
-    int dl_size = (log_dl_table_size == -1 ) ? 0 : (1 << log_dl_table_size);
-    int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
-    
-  /* Make disappearing links disappear */
-    for (i = 0; i < dl_size; i++) {
-      curr_dl = dl_head[i];
-      prev_dl = 0;
-      while (curr_dl != 0) {
-        real_ptr = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_obj);
-        real_link = (ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_link);
-        if (!GC_is_marked(real_ptr)) {
-            *(word *)real_link = 0;
-            next_dl = dl_next(curr_dl);
-            if (prev_dl == 0) {
-                dl_head[i] = next_dl;
-            } else {
-                dl_set_next(prev_dl, next_dl);
-            }
-            GC_clear_mark_bit((ptr_t)curr_dl);
-            GC_dl_entries--;
-            curr_dl = next_dl;
-        } else {
-            prev_dl = curr_dl;
-            curr_dl = dl_next(curr_dl);
-        }
-      }
-    }
-  /* Mark all objects reachable via chains of 1 or more pointers	*/
-  /* from finalizable objects.						*/
-    GC_ASSERT(GC_mark_state == MS_NONE);
-    for (i = 0; i < fo_size; i++) {
-      for (curr_fo = fo_head[i]; curr_fo != 0; curr_fo = fo_next(curr_fo)) {
-        real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
-        if (!GC_is_marked(real_ptr)) {
-	    GC_MARKED_FOR_FINALIZATION(real_ptr);
-            GC_MARK_FO(real_ptr, curr_fo -> fo_mark_proc);
-            if (GC_is_marked(real_ptr)) {
-                WARN("Finalization cycle involving %lx\n", real_ptr);
-            }
-        }
-      }
-    }
-  /* Enqueue for finalization all objects that are still		*/
-  /* unreachable.							*/
-    GC_words_finalized = 0;
-    for (i = 0; i < fo_size; i++) {
-      curr_fo = fo_head[i];
-      prev_fo = 0;
-      while (curr_fo != 0) {
-        real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
-        if (!GC_is_marked(real_ptr)) {
-	    if (!GC_java_finalization) {
-              GC_set_mark_bit(real_ptr);
-	    }
-            /* Delete from hash table */
-              next_fo = fo_next(curr_fo);
-              if (prev_fo == 0) {
-                fo_head[i] = next_fo;
-              } else {
-                fo_set_next(prev_fo, next_fo);
-              }
-              GC_fo_entries--;
-            /* Add to list of objects awaiting finalization.	*/
-              fo_set_next(curr_fo, GC_finalize_now);
-              GC_finalize_now = curr_fo;
-              /* unhide object pointer so any future collections will	*/
-              /* see it.						*/
-              curr_fo -> fo_hidden_base = 
-              		(word) REVEAL_POINTER(curr_fo -> fo_hidden_base);
-              GC_words_finalized +=
-                 	ALIGNED_WORDS(curr_fo -> fo_object_size)
-              		+ ALIGNED_WORDS(sizeof(struct finalizable_object));
-	    GC_ASSERT(GC_is_marked(GC_base((ptr_t)curr_fo)));
-            curr_fo = next_fo;
-        } else {
-            prev_fo = curr_fo;
-            curr_fo = fo_next(curr_fo);
-        }
-      }
-    }
-
-  if (GC_java_finalization) {
-    /* make sure we mark everything reachable from objects finalized
-       using the no_order mark_proc */
-      for (curr_fo = GC_finalize_now; 
-  	 curr_fo != NULL; curr_fo = fo_next(curr_fo)) {
-  	real_ptr = (ptr_t)curr_fo -> fo_hidden_base;
-  	if (!GC_is_marked(real_ptr)) {
-  	    if (curr_fo -> fo_mark_proc == GC_null_finalize_mark_proc) {
-  	        GC_MARK_FO(real_ptr, GC_normal_finalize_mark_proc);
-  	    }
-	    if (curr_fo -> fo_mark_proc != GC_unreachable_finalize_mark_proc) {
-		GC_set_mark_bit(real_ptr);
-	    }
-  	}
-      }
-
-      /* now revive finalize-when-unreachable objects reachable from
-	 other finalizable objects */
-      curr_fo = GC_finalize_now;
-      prev_fo = 0;
-      while (curr_fo != 0) {
-	next_fo = fo_next(curr_fo);
-	if (curr_fo -> fo_mark_proc == GC_unreachable_finalize_mark_proc) {
-	  real_ptr = (ptr_t)curr_fo -> fo_hidden_base;
-	  if (!GC_is_marked(real_ptr)) {
-	      GC_set_mark_bit(real_ptr);
-	  } else {
-	      if (prev_fo == 0)
-		GC_finalize_now = next_fo;
-	      else
-		fo_set_next(prev_fo, next_fo);
-
-              curr_fo -> fo_hidden_base =
-              		(word) HIDE_POINTER(curr_fo -> fo_hidden_base);
-              GC_words_finalized -=
-                 	ALIGNED_WORDS(curr_fo -> fo_object_size)
-              		+ ALIGNED_WORDS(sizeof(struct finalizable_object));
-
-	      i = HASH2(real_ptr, log_fo_table_size);
-	      fo_set_next (curr_fo, fo_head[i]);
-	      GC_fo_entries++;
-	      fo_head[i] = curr_fo;
-	      curr_fo = prev_fo;
-	  }
-	}
-	prev_fo = curr_fo;
-	curr_fo = next_fo;
-      }
-  }
-
-  /* Remove dangling disappearing links. */
-    for (i = 0; i < dl_size; i++) {
-      curr_dl = dl_head[i];
-      prev_dl = 0;
-      while (curr_dl != 0) {
-        real_link = GC_base((ptr_t)REVEAL_POINTER(curr_dl -> dl_hidden_link));
-        if (real_link != 0 && !GC_is_marked(real_link)) {
-            next_dl = dl_next(curr_dl);
-            if (prev_dl == 0) {
-                dl_head[i] = next_dl;
-            } else {
-                dl_set_next(prev_dl, next_dl);
-            }
-            GC_clear_mark_bit((ptr_t)curr_dl);
-            GC_dl_entries--;
-            curr_dl = next_dl;
-        } else {
-            prev_dl = curr_dl;
-            curr_dl = dl_next(curr_dl);
-        }
-      }
-    }
-}
-
-#ifndef JAVA_FINALIZATION_NOT_NEEDED
-
-/* Enqueue all remaining finalizers to be run - Assumes lock is
- * held, and signals are disabled */
-void GC_enqueue_all_finalizers()
-{
-    struct finalizable_object * curr_fo, * prev_fo, * next_fo;
-    ptr_t real_ptr;
-    register int i;
-    int fo_size;
-    
-    fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
-    GC_words_finalized = 0;
-    for (i = 0; i < fo_size; i++) {
-        curr_fo = fo_head[i];
-        prev_fo = 0;
-      while (curr_fo != 0) {
-          real_ptr = (ptr_t)REVEAL_POINTER(curr_fo -> fo_hidden_base);
-          GC_MARK_FO(real_ptr, GC_normal_finalize_mark_proc);
-          GC_set_mark_bit(real_ptr);
- 
-          /* Delete from hash table */
-          next_fo = fo_next(curr_fo);
-          if (prev_fo == 0) {
-              fo_head[i] = next_fo;
-          } else {
-              fo_set_next(prev_fo, next_fo);
-          }
-          GC_fo_entries--;
-
-          /* Add to list of objects awaiting finalization.	*/
-          fo_set_next(curr_fo, GC_finalize_now);
-          GC_finalize_now = curr_fo;
-
-          /* unhide object pointer so any future collections will	*/
-          /* see it.						*/
-          curr_fo -> fo_hidden_base = 
-        		(word) REVEAL_POINTER(curr_fo -> fo_hidden_base);
-
-          GC_words_finalized +=
-           	ALIGNED_WORDS(curr_fo -> fo_object_size)
-        		+ ALIGNED_WORDS(sizeof(struct finalizable_object));
-          curr_fo = next_fo;
-        }
-    }
-
-    return;
-}
-
-/* Invoke all remaining finalizers that haven't yet been run. 
- * This is needed for strict compliance with the Java standard, 
- * which can make the runtime guarantee that all finalizers are run.
- * Unfortunately, the Java standard implies we have to keep running
- * finalizers until there are no more left, a potential infinite loop.
- * YUCK.
- * Note that this is even more dangerous than the usual Java
- * finalizers, in that objects reachable from static variables
- * may have been finalized when these finalizers are run.
- * Finalizers run at this point must be prepared to deal with a
- * mostly broken world.
- * This routine is externally callable, so is called without 
- * the allocation lock. 
- */
-GC_API void GC_finalize_all()
-{
-    DCL_LOCK_STATE;
-
-    DISABLE_SIGNALS();
-    LOCK();
-    while (GC_fo_entries > 0) {
-      GC_enqueue_all_finalizers();
-      UNLOCK();
-      ENABLE_SIGNALS();
-      GC_INVOKE_FINALIZERS();
-      DISABLE_SIGNALS();
-      LOCK();
-    }
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-#endif
-
-/* Returns true if it is worth calling GC_invoke_finalizers. (Useful if	*/
-/* finalizers can only be called from some kind of `safe state' and	*/
-/* getting into that safe state is expensive.)				*/
-int GC_should_invoke_finalizers GC_PROTO((void))
-{
-    return GC_finalize_now != 0;
-}
-
-/* Invoke finalizers for all objects that are ready to be finalized.	*/
-/* Should be called without allocation lock.				*/
-int GC_invoke_finalizers()
-{
-    struct finalizable_object * curr_fo;
-    int count = 0;
-    word mem_freed_before;
-    DCL_LOCK_STATE;
-    
-    while (GC_finalize_now != 0) {
-#	ifdef THREADS
-	    DISABLE_SIGNALS();
-	    LOCK();
-#	endif
-	if (count == 0) {
-	    mem_freed_before = GC_mem_freed;
-	}
-    	curr_fo = GC_finalize_now;
-#	ifdef THREADS
- 	    if (curr_fo != 0) GC_finalize_now = fo_next(curr_fo);
-	    UNLOCK();
-	    ENABLE_SIGNALS();
-	    if (curr_fo == 0) break;
-#	else
-	    GC_finalize_now = fo_next(curr_fo);
-#	endif
- 	fo_set_next(curr_fo, 0);
-    	(*(curr_fo -> fo_fn))((ptr_t)(curr_fo -> fo_hidden_base),
-    			      curr_fo -> fo_client_data);
-    	curr_fo -> fo_client_data = 0;
-	++count;
-#	ifdef UNDEFINED
-	    /* This is probably a bad idea.  It throws off accounting if */
-	    /* nearly all objects are finalizable.  O.w. it shouldn't	 */
-	    /* matter.							 */
-    	    GC_free((GC_PTR)curr_fo);
-#	endif
-    }
-    if (count != 0 && mem_freed_before != GC_mem_freed) {
-        LOCK();
-	GC_finalizer_mem_freed += (GC_mem_freed - mem_freed_before);
-	UNLOCK();
-    }
-    return count;
-}
-
-void (* GC_finalizer_notifier)() = (void (*) GC_PROTO((void)))0;
-
-static GC_word last_finalizer_notification = 0;
-
-void GC_notify_or_invoke_finalizers GC_PROTO((void))
-{
-    /* This is a convenient place to generate backtraces if appropriate, */
-    /* since that code is not callable with the allocation lock.	 */
-#   if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
-      static word last_back_trace_gc_no = 1;	/* Skip first one. */
-
-      if (GC_gc_no > last_back_trace_gc_no) {
-	word i;
-
-#	ifdef KEEP_BACK_PTRS
-	  LOCK();
-	  /* Stops when GC_gc_no wraps; that's OK.	*/
-	  last_back_trace_gc_no = (word)(-1);  /* disable others. */
-	  for (i = 0; i < GC_backtraces; ++i) {
-	      /* FIXME: This tolerates concurrent heap mutation,	*/
-	      /* which may cause occasional mysterious results.		*/
-	      /* We need to release the GC lock, since GC_print_callers	*/
-	      /* acquires it.  It probably shouldn't.			*/
-	      UNLOCK();
-	      GC_generate_random_backtrace_no_gc();
-	      LOCK();
-	  }
-	  last_back_trace_gc_no = GC_gc_no;
-	  UNLOCK();
-#	endif
-#       ifdef MAKE_BACK_GRAPH
-	  if (GC_print_back_height)
-            GC_print_back_graph_stats();
-#	endif
-      }
-#   endif
-    if (GC_finalize_now == 0) return;
-    if (!GC_finalize_on_demand) {
-	(void) GC_invoke_finalizers();
-#	ifndef THREADS
-	  GC_ASSERT(GC_finalize_now == 0);
-#	endif	/* Otherwise GC can run concurrently and add more */
-	return;
-    }
-    if (GC_finalizer_notifier != (void (*) GC_PROTO((void)))0
-	&& last_finalizer_notification != GC_gc_no) {
-	last_finalizer_notification = GC_gc_no;
-	GC_finalizer_notifier();
-    }
-}
-
-# ifdef __STDC__
-    GC_PTR GC_call_with_alloc_lock(GC_fn_type fn,
-    					 GC_PTR client_data)
-# else
-    GC_PTR GC_call_with_alloc_lock(fn, client_data)
-    GC_fn_type fn;
-    GC_PTR client_data;
-# endif
-{
-    GC_PTR result;
-    DCL_LOCK_STATE;
-    
-#   ifdef THREADS
-      DISABLE_SIGNALS();
-      LOCK();
-      SET_LOCK_HOLDER();
-#   endif
-    result = (*fn)(client_data);
-#   ifdef THREADS
-#     ifndef GC_ASSERTIONS
-        UNSET_LOCK_HOLDER();
-#     endif /* o.w. UNLOCK() does it implicitly */
-      UNLOCK();
-      ENABLE_SIGNALS();
-#   endif
-    return(result);
-}
-
-#if !defined(NO_DEBUGGING)
-
-void GC_print_finalization_stats()
-{
-    struct finalizable_object *fo = GC_finalize_now;
-    size_t ready = 0;
-
-    GC_printf2("%lu finalization table entries; %lu disappearing links\n",
-	       GC_fo_entries, GC_dl_entries);
-    for (; 0 != fo; fo = fo_next(fo)) ++ready;
-    GC_printf1("%lu objects are eligible for immediate finalization\n", ready);
-}
-
-#endif /* NO_DEBUGGING */
diff --git a/boehm-gc/gc.mak b/boehm-gc/gc.mak
deleted file mode 100644
index 5f0b5462427..00000000000
--- a/boehm-gc/gc.mak
+++ /dev/null
@@ -1,2158 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
-# This has been hand-edited way too many times.
-# A clean, manually generated makefile would be an improvement.
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-!IF "$(CFG)" == ""
-CFG=gctest - Win32 Release
-!MESSAGE No configuration specified.  Defaulting to cord - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "gc - Win32 Release" && "$(CFG)" != "gc - Win32 Debug" &&\
- "$(CFG)" != "gctest - Win32 Release" && "$(CFG)" != "gctest - Win32 Debug" &&\
- "$(CFG)" != "cord - Win32 Release" && "$(CFG)" != "cord - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gc.mak" CFG="cord - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gctest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "gctest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "cord - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "cord - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "gctest - Win32 Debug"
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : ".\Release\gc.dll" ".\Release\gc.bsc"
-
-CLEAN : 
-	-@erase ".\Release\allchblk.obj"
-	-@erase ".\Release\allchblk.sbr"
-	-@erase ".\Release\alloc.obj"
-	-@erase ".\Release\alloc.sbr"
-	-@erase ".\Release\blacklst.obj"
-	-@erase ".\Release\blacklst.sbr"
-	-@erase ".\Release\checksums.obj"
-	-@erase ".\Release\checksums.sbr"
-	-@erase ".\Release\dbg_mlc.obj"
-	-@erase ".\Release\dbg_mlc.sbr"
-	-@erase ".\Release\dyn_load.obj"
-	-@erase ".\Release\dyn_load.sbr"
-	-@erase ".\Release\finalize.obj"
-	-@erase ".\Release\finalize.sbr"
-	-@erase ".\Release\gc.bsc"
-	-@erase ".\Release\gc_cpp.obj"
-	-@erase ".\Release\gc_cpp.sbr"
-	-@erase ".\Release\gc.dll"
-	-@erase ".\Release\gc.exp"
-	-@erase ".\Release\gc.lib"
-	-@erase ".\Release\headers.obj"
-	-@erase ".\Release\headers.sbr"
-	-@erase ".\Release\mach_dep.obj"
-	-@erase ".\Release\mach_dep.sbr"
-	-@erase ".\Release\malloc.obj"
-	-@erase ".\Release\malloc.sbr"
-	-@erase ".\Release\mallocx.obj"
-	-@erase ".\Release\mallocx.sbr"
-	-@erase ".\Release\mark.obj"
-	-@erase ".\Release\mark.sbr"
-	-@erase ".\Release\mark_rts.obj"
-	-@erase ".\Release\mark_rts.sbr"
-	-@erase ".\Release\misc.obj"
-	-@erase ".\Release\misc.sbr"
-	-@erase ".\Release\new_hblk.obj"
-	-@erase ".\Release\new_hblk.sbr"
-	-@erase ".\Release\obj_map.obj"
-	-@erase ".\Release\obj_map.sbr"
-	-@erase ".\Release\os_dep.obj"
-	-@erase ".\Release\os_dep.sbr"
-	-@erase ".\Release\ptr_chck.obj"
-	-@erase ".\Release\ptr_chck.sbr"
-	-@erase ".\Release\reclaim.obj"
-	-@erase ".\Release\reclaim.sbr"
-	-@erase ".\Release\stubborn.obj"
-	-@erase ".\Release\stubborn.sbr"
-	-@erase ".\Release\typd_mlc.obj"
-	-@erase ".\Release\typd_mlc.sbr"
-	-@erase ".\Release\win32_threads.obj"
-	-@erase ".\Release\win32_threads.sbr"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "SILENT" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "SILENT" /D "GC_BUILD" /D\
- "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
- "GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\Release/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
-BSC32_SBRS= \
-	".\Release\allchblk.sbr" \
-	".\Release\alloc.sbr" \
-	".\Release\blacklst.sbr" \
-	".\Release\checksums.sbr" \
-	".\Release\dbg_mlc.sbr" \
-	".\Release\dyn_load.sbr" \
-	".\Release\finalize.sbr" \
-	".\Release\gc_cpp.sbr" \
-	".\Release\headers.sbr" \
-	".\Release\mach_dep.sbr" \
-	".\Release\malloc.sbr" \
-	".\Release\mallocx.sbr" \
-	".\Release\mark.sbr" \
-	".\Release\mark_rts.sbr" \
-	".\Release\misc.sbr" \
-	".\Release\new_hblk.sbr" \
-	".\Release\obj_map.sbr" \
-	".\Release\os_dep.sbr" \
-	".\Release\ptr_chck.sbr" \
-	".\Release\reclaim.sbr" \
-	".\Release\stubborn.sbr" \
-	".\Release\typd_mlc.sbr" \
-	".\Release\win32_threads.sbr"
-
-".\Release\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/gc.pdb" /machine:I386 /out:"$(OUTDIR)/gc.dll"\
- /implib:"$(OUTDIR)/gc.lib" 
-LINK32_OBJS= \
-	".\Release\allchblk.obj" \
-	".\Release\alloc.obj" \
-	".\Release\blacklst.obj" \
-	".\Release\checksums.obj" \
-	".\Release\dbg_mlc.obj" \
-	".\Release\dyn_load.obj" \
-	".\Release\finalize.obj" \
-	".\Release\gc_cpp.obj" \
-	".\Release\headers.obj" \
-	".\Release\mach_dep.obj" \
-	".\Release\malloc.obj" \
-	".\Release\mallocx.obj" \
-	".\Release\mark.obj" \
-	".\Release\mark_rts.obj" \
-	".\Release\misc.obj" \
-	".\Release\new_hblk.obj" \
-	".\Release\obj_map.obj" \
-	".\Release\os_dep.obj" \
-	".\Release\ptr_chck.obj" \
-	".\Release\reclaim.obj" \
-	".\Release\stubborn.obj" \
-	".\Release\typd_mlc.obj" \
-	".\Release\win32_threads.obj"
-
-".\Release\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : ".\Debug\gc.dll" ".\Debug\gc.bsc"
-
-CLEAN : 
-	-@erase ".\Debug\allchblk.obj"
-	-@erase ".\Debug\allchblk.sbr"
-	-@erase ".\Debug\alloc.obj"
-	-@erase ".\Debug\alloc.sbr"
-	-@erase ".\Debug\blacklst.obj"
-	-@erase ".\Debug\blacklst.sbr"
-	-@erase ".\Debug\checksums.obj"
-	-@erase ".\Debug\checksums.sbr"
-	-@erase ".\Debug\dbg_mlc.obj"
-	-@erase ".\Debug\dbg_mlc.sbr"
-	-@erase ".\Debug\dyn_load.obj"
-	-@erase ".\Debug\dyn_load.sbr"
-	-@erase ".\Debug\finalize.obj"
-	-@erase ".\Debug\finalize.sbr"
-	-@erase ".\Debug\gc_cpp.obj"
-	-@erase ".\Debug\gc_cpp.sbr"
-	-@erase ".\Debug\gc.bsc"
-	-@erase ".\Debug\gc.dll"
-	-@erase ".\Debug\gc.exp"
-	-@erase ".\Debug\gc.lib"
-	-@erase ".\Debug\gc.map"
-	-@erase ".\Debug\gc.pdb"
-	-@erase ".\Debug\headers.obj"
-	-@erase ".\Debug\headers.sbr"
-	-@erase ".\Debug\mach_dep.obj"
-	-@erase ".\Debug\mach_dep.sbr"
-	-@erase ".\Debug\malloc.obj"
-	-@erase ".\Debug\malloc.sbr"
-	-@erase ".\Debug\mallocx.obj"
-	-@erase ".\Debug\mallocx.sbr"
-	-@erase ".\Debug\mark.obj"
-	-@erase ".\Debug\mark.sbr"
-	-@erase ".\Debug\mark_rts.obj"
-	-@erase ".\Debug\mark_rts.sbr"
-	-@erase ".\Debug\misc.obj"
-	-@erase ".\Debug\misc.sbr"
-	-@erase ".\Debug\new_hblk.obj"
-	-@erase ".\Debug\new_hblk.sbr"
-	-@erase ".\Debug\obj_map.obj"
-	-@erase ".\Debug\obj_map.sbr"
-	-@erase ".\Debug\os_dep.obj"
-	-@erase ".\Debug\os_dep.sbr"
-	-@erase ".\Debug\ptr_chck.obj"
-	-@erase ".\Debug\ptr_chck.sbr"
-	-@erase ".\Debug\reclaim.obj"
-	-@erase ".\Debug\reclaim.sbr"
-	-@erase ".\Debug\stubborn.obj"
-	-@erase ".\Debug\stubborn.sbr"
-	-@erase ".\Debug\typd_mlc.obj"
-	-@erase ".\Debug\typd_mlc.sbr"
-	-@erase ".\Debug\vc40.idb"
-	-@erase ".\Debug\vc40.pdb"
-	-@erase ".\Debug\win32_threads.obj"
-	-@erase ".\Debug\win32_threads.sbr"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "SILENT" /D "GC_BUILD" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "SILENT" /D "GC_BUILD"\
- /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D\
- "GC_WIN32_THREADS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\Debug/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
-BSC32_SBRS= \
-	".\Debug\allchblk.sbr" \
-	".\Debug\alloc.sbr" \
-	".\Debug\blacklst.sbr" \
-	".\Debug\checksums.sbr" \
-	".\Debug\dbg_mlc.sbr" \
-	".\Debug\dyn_load.sbr" \
-	".\Debug\finalize.sbr" \
-	".\Debug\gc_cpp.sbr" \
-	".\Debug\headers.sbr" \
-	".\Debug\mach_dep.sbr" \
-	".\Debug\malloc.sbr" \
-	".\Debug\mallocx.sbr" \
-	".\Debug\mark.sbr" \
-	".\Debug\mark_rts.sbr" \
-	".\Debug\misc.sbr" \
-	".\Debug\new_hblk.sbr" \
-	".\Debug\obj_map.sbr" \
-	".\Debug\os_dep.sbr" \
-	".\Debug\ptr_chck.sbr" \
-	".\Debug\reclaim.sbr" \
-	".\Debug\stubborn.sbr" \
-	".\Debug\typd_mlc.sbr" \
-	".\Debug\win32_threads.sbr"
-
-".\Debug\gc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/gc.pdb" /map:"$(INTDIR)/gc.map" /debug /machine:I386\
- /out:"$(OUTDIR)/gc.dll" /implib:"$(OUTDIR)/gc.lib" 
-LINK32_OBJS= \
-	".\Debug\allchblk.obj" \
-	".\Debug\alloc.obj" \
-	".\Debug\blacklst.obj" \
-	".\Debug\checksums.obj" \
-	".\Debug\dbg_mlc.obj" \
-	".\Debug\dyn_load.obj" \
-	".\Debug\finalize.obj" \
-	".\Debug\gc_cpp.obj" \
-	".\Debug\headers.obj" \
-	".\Debug\mach_dep.obj" \
-	".\Debug\malloc.obj" \
-	".\Debug\mallocx.obj" \
-	".\Debug\mark.obj" \
-	".\Debug\mark_rts.obj" \
-	".\Debug\misc.obj" \
-	".\Debug\new_hblk.obj" \
-	".\Debug\obj_map.obj" \
-	".\Debug\os_dep.obj" \
-	".\Debug\ptr_chck.obj" \
-	".\Debug\reclaim.obj" \
-	".\Debug\stubborn.obj" \
-	".\Debug\typd_mlc.obj" \
-	".\Debug\win32_threads.obj"
-
-".\Debug\gc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gctest\Release"
-# PROP BASE Intermediate_Dir "gctest\Release"
-# PROP BASE Target_Dir "gctest"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "gctest\Release"
-# PROP Intermediate_Dir "gctest\Release"
-# PROP Target_Dir "gctest"
-OUTDIR=.\gctest\Release
-INTDIR=.\gctest\Release
-
-ALL : "gc - Win32 Release" ".\Release\gctest.exe"
-
-CLEAN : 
-	-@erase ".\gctest\Release\test.obj"
-	-@erase ".\Release\gctest.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-test.c : tests\test.c
-	copy tests\test.c test.c
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS"\
- /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\gctest\Release/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/gctest.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)/gctest.pdb" /machine:I386 /out:"Release/gctest.exe" 
-LINK32_OBJS= \
-	".\gctest\Release\test.obj" \
-	".\Release\gc.lib"
-
-".\Release\gctest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gctest\Debug"
-# PROP BASE Intermediate_Dir "gctest\Debug"
-# PROP BASE Target_Dir "gctest"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "gctest\Debug"
-# PROP Intermediate_Dir "gctest\Debug"
-# PROP Target_Dir "gctest"
-OUTDIR=.\gctest\Debug
-INTDIR=.\gctest\Debug
-
-ALL : "gc - Win32 Debug" ".\Debug\gctest.exe" ".\gctest\Debug\gctest.bsc"
-
-CLEAN : 
-	-@erase ".\Debug\gctest.exe"
-	-@erase ".\gctest\Debug\gctest.bsc"
-	-@erase ".\gctest\Debug\gctest.map"
-	-@erase ".\gctest\Debug\gctest.pdb"
-	-@erase ".\gctest\Debug\test.obj"
-	-@erase ".\gctest\Debug\test.sbr"
-	-@erase ".\gctest\Debug\vc40.idb"
-	-@erase ".\gctest\Debug\vc40.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
- /D "ALL_INTERIOR_POINTERS" /D "__STDC__" /D "GC_WIN32_THREADS" /FR"$(INTDIR)/"\
- /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\gctest\Debug/
-CPP_SBRS=.\gctest\Debug/
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
-BSC32_SBRS= \
-	".\gctest\Debug\test.sbr"
-
-".\gctest\Debug\gctest.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"Debug/gctest.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)/gctest.pdb" /map:"$(INTDIR)/gctest.map" /debug /machine:I386\
- /out:"Debug/gctest.exe" 
-LINK32_OBJS= \
-	".\Debug\gc.lib" \
-	".\gctest\Debug\test.obj"
-
-".\Debug\gctest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cord\Release"
-# PROP BASE Intermediate_Dir "cord\Release"
-# PROP BASE Target_Dir "cord"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "cord\Release"
-# PROP Intermediate_Dir "cord\Release"
-# PROP Target_Dir "cord"
-OUTDIR=.\cord\Release
-INTDIR=.\cord\Release
-
-ALL : "gc - Win32 Release" ".\Release\de.exe"
-
-CLEAN : 
-	-@erase ".\cord\Release\cordbscs.obj"
-	-@erase ".\cord\Release\cordxtra.obj"
-	-@erase ".\cord\Release\de.obj"
-	-@erase ".\cord\Release\de_win.obj"
-	-@erase ".\cord\Release\de_win.res"
-	-@erase ".\Release\de.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\cord\Release/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/de.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)/de.pdb"\
- /machine:I386 /out:"Release/de.exe" 
-LINK32_OBJS= \
-	".\cord\Release\cordbscs.obj" \
-	".\cord\Release\cordxtra.obj" \
-	".\cord\Release\de.obj" \
-	".\cord\Release\de_win.obj" \
-	".\cord\Release\de_win.res" \
-	".\Release\gc.lib"
-
-".\Release\de.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cord\Debug"
-# PROP BASE Intermediate_Dir "cord\Debug"
-# PROP BASE Target_Dir "cord"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "cord\Debug"
-# PROP Intermediate_Dir "cord\Debug"
-# PROP Target_Dir "cord"
-OUTDIR=.\cord\Debug
-INTDIR=.\cord\Debug
-
-ALL : "gc - Win32 Debug" ".\Debug\de.exe"
-
-CLEAN : 
-	-@erase ".\cord\Debug\cordbscs.obj"
-	-@erase ".\cord\Debug\cordxtra.obj"
-	-@erase ".\cord\Debug\de.obj"
-	-@erase ".\cord\Debug\de.pdb"
-	-@erase ".\cord\Debug\de_win.obj"
-	-@erase ".\cord\Debug\de_win.res"
-	-@erase ".\cord\Debug\vc40.idb"
-	-@erase ".\cord\Debug\vc40.pdb"
-	-@erase ".\Debug\de.exe"
-	-@erase ".\Debug\de.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I include /D "_DEBUG" /D "WIN32" /D\
- "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX\
- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\cord\Debug/
-CPP_SBRS=.\.
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-MTL=mktyplib.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-RSC=rc.exe
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/de.exe"
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /incremental:yes\
- /pdb:"$(OUTDIR)/de.pdb" /debug /machine:I386 /out:"Debug/de.exe" 
-LINK32_OBJS= \
-	".\cord\Debug\cordbscs.obj" \
-	".\cord\Debug\cordxtra.obj" \
-	".\cord\Debug\de.obj" \
-	".\cord\Debug\de_win.obj" \
-	".\cord\Debug\de_win.res" \
-	".\Debug\gc.lib"
-
-".\Debug\de.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-################################################################################
-# Begin Target
-
-# Name "gc - Win32 Release"
-# Name "gc - Win32 Debug"
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\gc_cpp.cpp
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_cpp.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Release\gc_cpp.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_cpp.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Debug\gc_cpp.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\reclaim.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Release\reclaim.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_RECLA=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_RECLA=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-".\Debug\reclaim.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\os_dep.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_OS_DE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OS_DE=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	".\vd\PCR_VD.h"\
-	
-
-".\Release\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-".\Release\os_dep.sbr" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_OS_DE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OS_DE=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	".\vd\PCR_VD.h"\
-	
-
-".\Debug\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-".\Debug\os_dep.sbr" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\misc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MISC_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MISC_=\
-	".\il\PCR_IL.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-".\Release\misc.sbr" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MISC_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MISC_=\
-	".\il\PCR_IL.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-".\Debug\misc.sbr" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mark_rts.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MARK_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-".\Release\mark_rts.sbr" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MARK_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-".\Debug\mark_rts.sbr" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mach_dep.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MACH_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MACH_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-".\Release\mach_dep.sbr" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MACH_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MACH_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-".\Debug\mach_dep.sbr" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\headers.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_HEADE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_HEADE=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-".\Release\headers.sbr" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_HEADE=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_HEADE=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-".\Debug\headers.sbr" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\alloc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_ALLOC=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLOC=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-".\Release\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_ALLOC=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLOC=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-".\Debug\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\allchblk.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_ALLCH=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLCH=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-".\Release\allchblk.sbr" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_ALLCH=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_ALLCH=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-".\Debug\allchblk.sbr" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\stubborn.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_STUBB=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_STUBB=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Release\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_STUBB=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_STUBB=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Debug\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\obj_map.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_OBJ_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OBJ_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-".\Release\obj_map.sbr" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_OBJ_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_OBJ_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-".\Debug\obj_map.sbr" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\new_hblk.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_NEW_H=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_NEW_H=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-".\Release\new_hblk.sbr" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_NEW_H=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_NEW_H=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-".\Debug\new_hblk.sbr" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mark.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MARK_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-".\Release\mark.sbr" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MARK_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MARK_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-".\Debug\mark.sbr" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\malloc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MALLO=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLO=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-".\Release\malloc.sbr" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MALLO=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLO=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-".\Debug\malloc.sbr" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mallocx.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_MALLX=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLX=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-".\Release\mallocx.sbr" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_MALLX=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_MALLX=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-".\Debug\mallocx.sbr" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\finalize.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_FINAL=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_FINAL=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-".\Release\finalize.sbr" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_FINAL=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_FINAL=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-".\Debug\finalize.sbr" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\dbg_mlc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_DBG_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DBG_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-".\Release\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_DBG_M=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DBG_M=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-".\Debug\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\blacklst.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_BLACK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_BLACK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-".\Release\blacklst.sbr" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_BLACK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_BLACK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-".\Debug\blacklst.sbr" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\typd_mlc.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_TYPD_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TYPD_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-".\Release\typd_mlc.sbr" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_TYPD_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TYPD_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-".\Debug\typd_mlc.sbr" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\ptr_chck.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_PTR_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_PTR_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-".\Release\ptr_chck.sbr" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_PTR_C=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_pmark.h"\
-	".\include\gc_mark.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_PTR_C=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-".\Debug\ptr_chck.sbr" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\dyn_load.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_DYN_L=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DYN_L=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-".\Release\dyn_load.sbr" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_DYN_L=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_DYN_L=\
-	".\il\PCR_IL.h"\
-	".\mm\PCR_MM.h"\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-".\Debug\dyn_load.sbr" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\win32_threads.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_WIN32=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_WIN32=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-".\Release\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_WIN32=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_WIN32=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-".\Debug\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\checksums.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_CHECK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_CHECK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Release\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-".\Release\checksums.sbr" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_CHECK=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_CHECK=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-".\Debug\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-".\Debug\checksums.sbr" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "gctest - Win32 Release"
-# Name "gctest - Win32 Debug"
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Project Dependency
-
-# Project_Dep_Name "gc"
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
-
-!ENDIF 
-
-# End Project Dependency
-################################################################################
-# Begin Source File
-
-SOURCE=.\tests\test.c
-DEP_CPP_TEST_=\
-	".\include\private\gcconfig.h"\
-	".\include\gc.h"\
-	".\include\private\gc_hdrs.h"\
-	".\include\private\gc_priv.h"\
-	".\include\gc_typed.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-NODEP_CPP_TEST_=\
-	".\th\PCR_Th.h"\
-	".\th\PCR_ThCrSec.h"\
-	".\th\PCR_ThCtl.h"\
-	
-
-!IF  "$(CFG)" == "gctest - Win32 Release"
-
-
-".\gctest\Release\test.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
-
-
-".\gctest\Debug\test.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-".\gctest\Debug\test.sbr" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "cord - Win32 Release"
-# Name "cord - Win32 Debug"
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Project Dependency
-
-# Project_Dep_Name "gc"
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
-
-!ENDIF 
-
-# End Project Dependency
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de_win.c
-DEP_CPP_DE_WI=\
-	".\include\cord.h"\
-	".\cord\de_cmds.h"\
-	".\cord\de_win.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_DE_WI=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de_win.obj" : $(SOURCE) $(DEP_CPP_DE_WI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de_win.obj" : $(SOURCE) $(DEP_CPP_DE_WI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de.c
-DEP_CPP_DE_C2e=\
-	".\include\cord.h"\
-	".\cord\de_cmds.h"\
-	".\cord\de_win.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_DE_C2e=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de.obj" : $(SOURCE) $(DEP_CPP_DE_C2e) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de.obj" : $(SOURCE) $(DEP_CPP_DE_C2e) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\cordxtra.c
-DEP_CPP_CORDX=\
-	".\include\cord.h"\
-	".\include\ec.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_CORDX=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\cordxtra.obj" : $(SOURCE) $(DEP_CPP_CORDX) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\cordxtra.obj" : $(SOURCE) $(DEP_CPP_CORDX) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\cordbscs.c
-DEP_CPP_CORDB=\
-	".\include\cord.h"\
-	".\include\private\cord_pos.h"\
-	
-NODEP_CPP_CORDB=\
-	".\include\gc.h"\
-	
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\cordbscs.obj" : $(SOURCE) $(DEP_CPP_CORDB) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\cordbscs.obj" : $(SOURCE) $(DEP_CPP_CORDB) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cord\de_win.RC
-
-!IF  "$(CFG)" == "cord - Win32 Release"
-
-
-".\cord\Release\de_win.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)/de_win.res" /i "cord" /d "NDEBUG" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "cord - Win32 Debug"
-
-
-".\cord\Debug\de_win.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)/de_win.res" /i "cord" /d "_DEBUG" $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/boehm-gc/gc_cpp.cc b/boehm-gc/gc_cpp.cc
deleted file mode 100644
index f8b803a8baa..00000000000
--- a/boehm-gc/gc_cpp.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
-Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- 
-THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- 
-    Last modified on Sat Nov 19 19:31:14 PST 1994 by ellis
-                  on Sat Jun  8 15:10:00 PST 1994 by boehm
-
-Permission is hereby granted to copy this code for any purpose,
-provided the above notices are retained on all copies.
-
-This implementation module for gc_c++.h provides an implementation of
-the global operators "new" and "delete" that calls the Boehm
-allocator.  All objects allocated by this implementation will be
-non-collectable but part of the root set of the collector.
-
-You should ensure (using implementation-dependent techniques) that the
-linker finds this module before the library that defines the default
-built-in "new" and "delete".
-
-Authors: John R. Ellis and Jesse Hull
-
-**************************************************************************/
-/* Boehm, December 20, 1994 7:26 pm PST */
-
-#include "gc_cpp.h"
-
-void* operator new( size_t size ) {
-    return GC_MALLOC_UNCOLLECTABLE( size );}
-  
-void operator delete( void* obj ) {
-    GC_FREE( obj );}
-  
-#ifdef GC_OPERATOR_NEW_ARRAY
-
-void* operator new[]( size_t size ) {
-    return GC_MALLOC_UNCOLLECTABLE( size );}
-  
-void operator delete[]( void* obj ) {
-    GC_FREE( obj );}
-
-#endif /* GC_OPERATOR_NEW_ARRAY */
-
-#ifdef _MSC_VER
-
-// This new operator is used by VC++ in case of Debug builds !
-void* operator new( size_t size,
-			  int ,//nBlockUse,
-			  const char * szFileName,
-			  int nLine )
-{
-#ifndef GC_DEBUG
-	return GC_malloc_uncollectable( size );
-#else
-	return GC_debug_malloc_uncollectable(size, szFileName, nLine);
-#endif
-}
-
-#endif /* _MSC_VER */
-
diff --git a/boehm-gc/gc_cpp.cpp b/boehm-gc/gc_cpp.cpp
deleted file mode 100644
index f6bd95e59a5..00000000000
--- a/boehm-gc/gc_cpp.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// Visual C++ seems to prefer a .cpp extension to .cc
-#include "gc_cpp.cc"
diff --git a/boehm-gc/gc_dlopen.c b/boehm-gc/gc_dlopen.c
deleted file mode 100644
index 4c690edcfe4..00000000000
--- a/boehm-gc/gc_dlopen.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Original author: Bill Janssen
- * Heavily modified by Hans Boehm and others
- */
-
-/*
- * This used to be in dyn_load.c.  It was extracted into a separate file
- * to avoid having to link against libdl.{a,so} if the client doesn't call
- * dlopen.  Of course this fails if the collector is in a dynamic
- * library. -HB
- */
-
-#include "private/gc_priv.h"
-
-# if (defined(GC_PTHREADS) && !defined(GC_DARWIN_THREADS)) \
-      || defined(GC_SOLARIS_THREADS)
-
-# if defined(dlopen) && !defined(GC_USE_LD_WRAP)
-    /* To support various threads pkgs, gc.h interposes on dlopen by     */
-    /* defining "dlopen" to be "GC_dlopen", which is implemented below.  */
-    /* However, both GC_FirstDLOpenedLinkMap() and GC_dlopen() use the   */
-    /* real system dlopen() in their implementation. We first remove     */
-    /* gc.h's dlopen definition and restore it later, after GC_dlopen(). */
-#   undef dlopen
-# endif
-
-  /* Make sure we're not in the middle of a collection, and make	*/
-  /* sure we don't start any.	Returns previous value of GC_dont_gc.	*/
-  /* This is invoked prior to a dlopen call to avoid synchronization	*/
-  /* issues.  We can't just acquire the allocation lock, since startup 	*/
-  /* code in dlopen may try to allocate.				*/
-  /* This solution risks heap growth in the presence of many dlopen	*/
-  /* calls in either a multithreaded environment, or if the library	*/
-  /* initialization code allocates substantial amounts of GC'ed memory.	*/
-  /* But I don't know of a better solution.				*/
-  static void disable_gc_for_dlopen()
-  {
-    LOCK();
-    while (GC_incremental && GC_collection_in_progress()) {
-	GC_collect_a_little_inner(1000);
-    }
-    ++GC_dont_gc;
-    UNLOCK();
-  }
-
-  /* Redefine dlopen to guarantee mutual exclusion with	*/
-  /* GC_register_dynamic_libraries.			*/
-  /* Should probably happen for other operating	systems, too. */
-
-#include <dlfcn.h>
-
-#ifdef GC_USE_LD_WRAP
-  void * __wrap_dlopen(const char *path, int mode)
-#else
-  void * GC_dlopen(path, mode)
-  GC_CONST char * path;
-  int mode;
-#endif
-{
-    void * result;
-    
-#   ifndef USE_PROC_FOR_LIBRARIES
-      disable_gc_for_dlopen();
-#   endif
-#   ifdef GC_USE_LD_WRAP
-      result = (void *)__real_dlopen(path, mode);
-#   else
-      result = dlopen(path, mode);
-#   endif
-#   ifndef USE_PROC_FOR_LIBRARIES
-      GC_enable(); /* undoes disable_gc_for_dlopen */
-#   endif
-    return(result);
-}
-# endif  /* GC_PTHREADS || GC_SOLARIS_THREADS ... */
-
-
-
diff --git a/boehm-gc/gcc_support.c b/boehm-gc/gcc_support.c
deleted file mode 100644
index e8a7b8201db..00000000000
--- a/boehm-gc/gcc_support.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/***************************************************************************
-
-Interface between g++ and Boehm GC
-
-    Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
-
-    THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-    OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-
-    Permission is hereby granted to copy this code for any purpose,
-    provided the above notices are retained on all copies.
-
-    Last modified on Sun Jul 16 23:21:14 PDT 1995 by ellis
-
-This module provides runtime support for implementing the
-Ellis/Detlefs GC proposal, "Safe, Efficient Garbage Collection for
-C++", within g++, using its -fgc-keyword extension.  It defines
-versions of __builtin_new, __builtin_new_gc, __builtin_vec_new,
-__builtin_vec_new_gc, __builtin_delete, and __builtin_vec_delete that
-invoke the Bohem GC.  It also implements the WeakPointer.h interface.
-
-This module assumes the following configuration options of the Boehm GC:
-
-    -DALL_INTERIOR_POINTERS
-    -DDONT_ADD_BYTE_AT_END   
-
-This module adds its own required padding to the end of objects to
-support C/C++ "one-past-the-object" pointer semantics.
-
-****************************************************************************/
-
-#include <stddef.h>
-#include "gc.h"
-
-#if defined(__STDC__) 
-#   define PROTO( args ) args
-#else
-#    define PROTO( args ) ()
-#    endif
-
-#define BITSPERBYTE 8     
-    /* What's the portable way to do this? */
-
-
-typedef void (*vfp) PROTO(( void ));
-extern vfp __new_handler;
-extern void __default_new_handler PROTO(( void ));
-
-
-/* A destructor_proc is the compiler generated procedure representing a 
-C++ destructor.  The "flag" argument is a hidden argument following some
-compiler convention. */
-
-typedef (*destructor_proc) PROTO(( void* this, int flag ));
-
-
-/***************************************************************************
-
-A BI_header is the header the compiler adds to the front of
-new-allocated arrays of objects with destructors.  The header is
-padded out to a double, because that's what the compiler does to
-ensure proper alignment of array elements on some architectures.  
-
-int NUM_ARRAY_ELEMENTS (void* o)
-    returns the number of array elements for array object o.
-
-char* FIRST_ELEMENT_P (void* o)
-    returns the address of the first element of array object o.
-
-***************************************************************************/
-
-typedef struct BI_header {
-    int nelts;
-    char padding [sizeof( double ) - sizeof( int )]; 
-        /* Better way to do this? */
-} BI_header;
-
-#define NUM_ARRAY_ELEMENTS( o ) \
-  (((BI_header*) o)->nelts)
-
-#define FIRST_ELEMENT_P( o ) \
-  ((char*) o + sizeof( BI_header ))
-
-
-/***************************************************************************
-
-The __builtin_new routines add a descriptor word to the end of each
-object.   The descriptor serves two purposes.  
-
-First, the descriptor acts as padding, implementing C/C++ pointer
-semantics.  C and C++ allow a valid array pointer to be incremented
-one past the end of an object.  The extra padding ensures that the
-collector will recognize that such a pointer points to the object and
-not the next object in memory.
-
-Second, the descriptor stores three extra pieces of information,
-whether an object has a registered finalizer (destructor), whether it
-may have any weak pointers referencing it, and for collectible arrays,
-the element size of the array.  The element size is required for the
-array's finalizer to iterate through the elements of the array.  (An
-alternative design would have the compiler generate a finalizer
-procedure for each different array type.  But given the overhead of
-finalization, there isn't any efficiency to be gained by that.)
-
-The descriptor must be added to non-collectible as well as collectible
-objects, since the Ellis/Detlefs proposal allows "pointer to gc T" to
-be assigned to a "pointer to T", which could then be deleted.  Thus,
-__builtin_delete must determine at runtime whether an object is
-collectible, whether it has weak pointers referencing it, and whether
-it may have a finalizer that needs unregistering.  Though
-GC_REGISTER_FINALIZER doesn't care if you ask it to unregister a
-finalizer for an object that doesn't have one, it is a non-trivial
-procedure that does a hash look-up, etc.  The descriptor trades a
-little extra space for a significant increase in time on the fast path
-through delete.  (A similar argument applies to
-GC_UNREGISTER_DISAPPEARING_LINK).
-
-For non-array types, the space for the descriptor could be shrunk to a
-single byte for storing the "has finalizer" flag.  But this would save
-space only on arrays of char (whose size is not a multiple of the word
-size) and structs whose largest member is less than a word in size
-(very infrequent).  And it would require that programmers actually
-remember to call "delete[]" instead of "delete" (which they should,
-but there are probably lots of buggy programs out there).  For the
-moment, the space savings seems not worthwhile, especially considering
-that the Boehm GC is already quite space competitive with other
-malloc's.
-
-
-Given a pointer o to the base of an object:
-
-Descriptor* DESCRIPTOR (void* o) 
-     returns a pointer to the descriptor for o.
-
-The implementation of descriptors relies on the fact that the GC
-implementation allocates objects in units of the machine's natural
-word size (e.g. 32 bits on a SPARC, 64 bits on an Alpha).
-
-**************************************************************************/
-
-typedef struct Descriptor {
-    unsigned has_weak_pointers: 1;
-    unsigned has_finalizer: 1;
-    unsigned element_size: BITSPERBYTE * sizeof( unsigned ) - 2; 
-} Descriptor;
-
-#define DESCRIPTOR( o ) \
-  ((Descriptor*) ((char*)(o) + GC_size( o ) - sizeof( Descriptor )))
-
-
-/**************************************************************************
-
-Implementations of global operator new() and operator delete()
-
-***************************************************************************/
-
-
-void* __builtin_new( size ) 
-    size_t size;
-    /* 
-    For non-gc non-array types, the compiler generates calls to
-    __builtin_new, which allocates non-collected storage via
-    GC_MALLOC_UNCOLLECTABLE.  This ensures that the non-collected
-    storage will be part of the collector's root set, required by the
-    Ellis/Detlefs semantics. */
-{
-    vfp handler = __new_handler ? __new_handler : __default_new_handler;
-
-    while (1) {
-        void* o = GC_MALLOC_UNCOLLECTABLE( size + sizeof( Descriptor ) );
-        if (o != 0) return o;
-        (*handler) ();}}
-
-
-void* __builtin_vec_new( size ) 
-    size_t size;
-    /* 
-    For non-gc array types, the compiler generates calls to
-    __builtin_vec_new. */
-{
-    return __builtin_new( size );}
-
-
-void* __builtin_new_gc( size )
-    size_t size;
-    /* 
-    For gc non-array types, the compiler generates calls to
-    __builtin_new_gc, which allocates collected storage via
-    GC_MALLOC. */
-{
-    vfp handler = __new_handler ? __new_handler : __default_new_handler;
-
-    while (1) {
-        void* o = GC_MALLOC( size + sizeof( Descriptor ) );
-        if (o != 0) return o;
-        (*handler) ();}}
-
-
-void* __builtin_new_gc_a( size )
-    size_t size;
-    /* 
-    For non-pointer-containing gc non-array types, the compiler
-    generates calls to __builtin_new_gc_a, which allocates collected
-    storage via GC_MALLOC_ATOMIC. */
-{
-    vfp handler = __new_handler ? __new_handler : __default_new_handler;
-
-    while (1) {
-        void* o = GC_MALLOC_ATOMIC( size + sizeof( Descriptor ) );
-        if (o != 0) return o;
-        (*handler) ();}}
-
-
-void* __builtin_vec_new_gc( size )
-    size_t size;
-    /*
-    For gc array types, the compiler generates calls to
-    __builtin_vec_new_gc. */
-{
-    return __builtin_new_gc( size );}
-
-
-void* __builtin_vec_new_gc_a( size )
-    size_t size;
-    /*
-    For non-pointer-containing gc array types, the compiler generates
-    calls to __builtin_vec_new_gc_a. */
-{
-    return __builtin_new_gc_a( size );}
-
-
-static void call_destructor( o, data )
-    void* o;
-    void* data;
-    /* 
-    call_destructor is the GC finalizer proc registered for non-array
-    gc objects with destructors.  Its client data is the destructor
-    proc, which it calls with the magic integer 2, a special flag
-    obeying the compiler convention for destructors. */
-{
-    ((destructor_proc) data)( o, 2 );}
-
-
-void* __builtin_new_gc_dtor( o, d )
-    void* o;
-    destructor_proc d;
-    /* 
-    The compiler generates a call to __builtin_new_gc_dtor to register
-    the destructor "d" of a non-array gc object "o" as a GC finalizer.
-    The destructor is registered via
-    GC_REGISTER_FINALIZER_IGNORE_SELF, which causes the collector to
-    ignore pointers from the object to itself when determining when
-    the object can be finalized.  This is necessary due to the self
-    pointers used in the internal representation of multiply-inherited
-    objects. */
-{
-    Descriptor* desc = DESCRIPTOR( o );
-
-    GC_REGISTER_FINALIZER_IGNORE_SELF( o, call_destructor, d, 0, 0 );
-    desc->has_finalizer = 1;}
-
-
-static void call_array_destructor( o, data )
-    void* o;
-    void* data;
-    /*
-    call_array_destructor is the GC finalizer proc registered for gc
-    array objects whose elements have destructors. Its client data is
-    the destructor proc.  It iterates through the elements of the
-    array in reverse order, calling the destructor on each. */
-{
-    int num = NUM_ARRAY_ELEMENTS( o );
-    Descriptor* desc = DESCRIPTOR( o );
-    size_t size = desc->element_size;
-    char* first_p = FIRST_ELEMENT_P( o );
-    char* p = first_p + (num - 1) * size;
-
-    if (num > 0) {
-        while (1) {
-            ((destructor_proc) data)( p, 2 );
-            if (p == first_p) break;
-            p -= size;}}}
-
-
-void* __builtin_vec_new_gc_dtor( first_elem, d, element_size )
-    void* first_elem;
-    destructor_proc d;
-    size_t element_size;
-    /* 
-    The compiler generates a call to __builtin_vec_new_gc_dtor to
-    register the destructor "d" of a gc array object as a GC
-    finalizer.  "first_elem" points to the first element of the array,
-    *not* the beginning of the object (this makes the generated call
-    to this function smaller).  The elements of the array are of size
-    "element_size".  The destructor is registered as in
-    _builtin_new_gc_dtor. */
-{
-    void* o = (char*) first_elem - sizeof( BI_header );
-    Descriptor* desc = DESCRIPTOR( o );
-
-    GC_REGISTER_FINALIZER_IGNORE_SELF( o, call_array_destructor, d, 0, 0 );
-    desc->element_size = element_size;
-    desc->has_finalizer = 1;}
-
-
-void __builtin_delete( o )
-    void* o;
-    /* 
-    The compiler generates calls to __builtin_delete for operator
-    delete().  The GC currently requires that any registered
-    finalizers be unregistered before explicitly freeing an object.
-    If the object has any weak pointers referencing it, we can't
-    actually free it now. */
-{
-  if (o != 0) { 
-      Descriptor* desc = DESCRIPTOR( o );
-      if (desc->has_finalizer) GC_REGISTER_FINALIZER( o, 0, 0, 0, 0 );
-      if (! desc->has_weak_pointers) GC_FREE( o );}}
-
-
-void __builtin_vec_delete( o )
-    void* o;
-    /* 
-    The compiler generates calls to __builitn_vec_delete for operator
-    delete[](). */
-{
-  __builtin_delete( o );}
-
-
-/**************************************************************************
-
-Implementations of the template class WeakPointer from WeakPointer.h
-
-***************************************************************************/
-
-typedef struct WeakPointer {
-    void* pointer; 
-} WeakPointer;
-
-
-void* _WeakPointer_New( t )
-    void* t;
-{
-    if (t == 0) {
-        return 0;}
-    else {
-        void* base = GC_base( t );
-        WeakPointer* wp = 
-            (WeakPointer*) GC_MALLOC_ATOMIC( sizeof( WeakPointer ) );
-        Descriptor* desc = DESCRIPTOR( base );
-
-        wp->pointer = t;
-        desc->has_weak_pointers = 1;
-        GC_general_register_disappearing_link( &wp->pointer, base );
-        return wp;}}
-
-
-static void* PointerWithLock( wp ) 
-    WeakPointer* wp;
-{
-    if (wp == 0 || wp->pointer == 0) {
-      return 0;}
-    else {
-        return (void*) wp->pointer;}}
-
-
-void* _WeakPointer_Pointer( wp )
-    WeakPointer* wp;
-{
-    return (void*) GC_call_with_alloc_lock( PointerWithLock, wp );}
-
-
-typedef struct EqualClosure {
-    WeakPointer* wp1;
-    WeakPointer* wp2;
-} EqualClosure;
-
-
-static void* EqualWithLock( ec )
-    EqualClosure* ec;
-{
-    if (ec->wp1 == 0 || ec->wp2 == 0) {
-        return (void*) (ec->wp1 == ec->wp2);}
-    else {
-      return (void*) (ec->wp1->pointer == ec->wp2->pointer);}}
-
-
-int _WeakPointer_Equal( wp1,  wp2 )
-    WeakPointer* wp1;
-    WeakPointer* wp2;
-{
-    EqualClosure ec;
-
-    ec.wp1 = wp1;
-    ec.wp2 = wp2;
-    return (int) GC_call_with_alloc_lock( EqualWithLock, &ec );}
-
-
-int _WeakPointer_Hash( wp )
-    WeakPointer* wp;
-{
-    return (int) _WeakPointer_Pointer( wp );}
-
-
-/**************************************************************************
-
-Implementations of the template class CleanUp from WeakPointer.h
-
-***************************************************************************/
-
-typedef struct Closure {
-    void (*c) PROTO(( void* d, void* t ));
-    ptrdiff_t t_offset; 
-    void* d;
-} Closure;
-
-
-static void _CleanUp_CallClosure( obj, data ) 
-    void* obj;
-    void* data;
-{
-    Closure* closure = (Closure*) data;
-    closure->c( closure->d, (char*) obj + closure->t_offset );}
-
-
-void _CleanUp_Set( t, c, d ) 
-    void* t;
-    void (*c) PROTO(( void* d, void* t ));
-    void* d;
-{
-    void* base = GC_base( t );
-    Descriptor* desc = DESCRIPTOR( t );
-
-    if (c == 0) {
-        GC_REGISTER_FINALIZER_IGNORE_SELF( base, 0, 0, 0, 0 );
-        desc->has_finalizer = 0;}
-    else {
-        Closure* closure = (Closure*) GC_MALLOC( sizeof( Closure ) );
-        closure->c = c;
-        closure->t_offset = (char*) t - (char*) base;
-        closure->d = d;
-        GC_REGISTER_FINALIZER_IGNORE_SELF( base, _CleanUp_CallClosure, 
-                                           closure, 0, 0 );
-        desc->has_finalizer = 1;}}
-
-
-void _CleanUp_Call( t ) 
-    void* t;
-{
-      /* ? Aren't we supposed to deactivate weak pointers to t too? 
-         Why? */
-    void* base = GC_base( t );
-    void* d;
-    GC_finalization_proc f;
-
-    GC_REGISTER_FINALIZER( base, 0, 0, &f, &d );
-    f( base, d );}
-
-
-typedef struct QueueElem {
-    void* o;
-    GC_finalization_proc f;
-    void* d;
-    struct QueueElem* next; 
-} QueueElem;
-
-
-void* _CleanUp_Queue_NewHead()
-{
-    return GC_MALLOC( sizeof( QueueElem ) );}
-    
-     
-static void _CleanUp_Queue_Enqueue( obj, data )
-    void* obj; 
-    void* data;
-{
-    QueueElem* q = (QueueElem*) data;
-    QueueElem* head = q->next;
-
-    q->o = obj;
-    q->next = head->next;
-    head->next = q;}
-    
-    
-void _CleanUp_Queue_Set( h, t ) 
-    void* h;
-    void* t;
-{
-    QueueElem* head = (QueueElem*) h;
-    void* base = GC_base( t );
-    void* d;
-    GC_finalization_proc f;
-    QueueElem* q = (QueueElem*) GC_MALLOC( sizeof( QueueElem ) );
-     
-    GC_REGISTER_FINALIZER( base, _CleanUp_Queue_Enqueue, q, &f, &d );
-    q->f = f;
-    q->d = d;
-    q->next = head;}
-    
-
-int _CleanUp_Queue_Call( h ) 
-    void* h;
-{
-    QueueElem* head = (QueueElem*) h;
-    QueueElem* q = head->next;
-
-    if (q == 0) {
-        return 0;}
-    else {
-        head->next = q->next;
-        q->next = 0;
-        if (q->f != 0) q->f( q->o, q->d );
-        return 1;}}
-
-
-
diff --git a/boehm-gc/gcj_mlc.c b/boehm-gc/gcj_mlc.c
deleted file mode 100644
index 2aaef795d92..00000000000
--- a/boehm-gc/gcj_mlc.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-/* Boehm, July 31, 1995 5:02 pm PDT */
-
-/*
- * This is an allocator interface tuned for gcj (the GNU static
- * java compiler).
- *
- * Each allocated object has a pointer in its first word to a vtable,
- * which for our purposes is simply a structure describing the type of
- * the object.
- * This descriptor structure contains a GC marking descriptor at offset
- * MARK_DESCR_OFFSET.
- *
- * It is hoped that this interface may also be useful for other systems,
- * possibly with some tuning of the constants.  But the immediate goal
- * is to get better gcj performance.
- *
- * We assume:
- *  1) We have an ANSI conforming C compiler.
- *  2) Counting on explicit initialization of this interface is OK.
- *  3) FASTLOCK is not a significant win.
- */
-
-#include "private/gc_pmark.h"
-#include "gc_gcj.h"
-#include "private/dbg_mlc.h"
-
-#ifdef GC_GCJ_SUPPORT
-
-GC_bool GC_gcj_malloc_initialized = FALSE;
-
-int GC_gcj_kind;	/* Object kind for objects with descriptors     */
-			/* in "vtable".					*/
-int GC_gcj_debug_kind;	/* The kind of objects that is always marked 	*/
-			/* with a mark proc call.			*/
-
-ptr_t * GC_gcjobjfreelist;
-ptr_t * GC_gcjdebugobjfreelist;
-
-/* Caller does not hold allocation lock. */
-void GC_init_gcj_malloc(int mp_index, void * /* really GC_mark_proc */mp)
-{
-    register int i;
-    GC_bool ignore_gcj_info;
-    DCL_LOCK_STATE;
-
-    GC_init();	/* In case it's not already done.	*/
-    DISABLE_SIGNALS();
-    LOCK();
-    if (GC_gcj_malloc_initialized) {
-      UNLOCK();
-      ENABLE_SIGNALS();
-      return;
-    }
-    GC_gcj_malloc_initialized = TRUE;
-    ignore_gcj_info = (0 != GETENV("GC_IGNORE_GCJ_INFO"));
-#   ifdef CONDPRINT
-      if (GC_print_stats && ignore_gcj_info) {
-        GC_printf0("Gcj-style type information is disabled!\n");
-      }
-#   endif
-    GC_ASSERT(GC_mark_procs[mp_index] == (GC_mark_proc)0); /* unused */
-    GC_mark_procs[mp_index] = (GC_mark_proc)mp;
-    if (mp_index >= GC_n_mark_procs) ABORT("GC_init_gcj_malloc: bad index");
-    /* Set up object kind gcj-style indirect descriptor. */
-      GC_gcjobjfreelist = (ptr_t *)GC_new_free_list_inner();
-      if (ignore_gcj_info) {
-	/* Use a simple length-based descriptor, thus forcing a fully	*/
-	/* conservative scan.						*/
-	GC_gcj_kind = GC_new_kind_inner((void **)GC_gcjobjfreelist,
-					(0 | GC_DS_LENGTH),
-				        TRUE, TRUE);
-      } else {
-	GC_gcj_kind = GC_new_kind_inner(
-			(void **)GC_gcjobjfreelist,
-			(((word)(-MARK_DESCR_OFFSET - GC_INDIR_PER_OBJ_BIAS))
-	   		 | GC_DS_PER_OBJECT),
-			FALSE, TRUE);
-      }
-    /* Set up object kind for objects that require mark proc call.	*/
-      if (ignore_gcj_info) {
-	GC_gcj_debug_kind = GC_gcj_kind;
-        GC_gcjdebugobjfreelist = GC_gcjobjfreelist;
-      } else {
-        GC_gcjdebugobjfreelist = (ptr_t *)GC_new_free_list_inner();
-	GC_gcj_debug_kind = GC_new_kind_inner(
-				(void **)GC_gcjdebugobjfreelist,
-				GC_MAKE_PROC(mp_index,
-				     	     1 /* allocated with debug info */),
-				FALSE, TRUE);
-      }
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-ptr_t GC_clear_stack();
-
-#define GENERAL_MALLOC(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc_inner((word)lb, k))
-    
-#define GENERAL_MALLOC_IOP(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc_inner_ignore_off_page(lb, k))
-
-/* We need a mechanism to release the lock and invoke finalizers.	*/
-/* We don't really have an opportunity to do this on a rarely executed	*/
-/* path on which the lock is not held.  Thus we check at a 		*/
-/* rarely executed point at which it is safe to release the lock.	*/
-/* We do this even where we could just call GC_INVOKE_FINALIZERS,	*/
-/* since it's probably cheaper and certainly more uniform.		*/
-/* FIXME - Consider doing the same elsewhere?				*/
-static void maybe_finalize()
-{
-   static int last_finalized_no = 0;
-
-   if (GC_gc_no == last_finalized_no) return;
-   if (!GC_is_initialized) return;
-   UNLOCK();
-   GC_INVOKE_FINALIZERS();
-   last_finalized_no = GC_gc_no;
-   LOCK();
-}
-
-/* Allocate an object, clear it, and store the pointer to the	*/
-/* type structure (vtable in gcj).				*/
-/* This adds a byte at the end of the object if GC_malloc would.*/
-void * GC_gcj_malloc(size_t lb, void * ptr_to_struct_containing_descr)
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( EXPECT(SMALL_OBJ(lb), 1) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_gcjobjfreelist[lw]);
-	LOCK();
-	op = *opp;
-        if(EXPECT(op == 0, 0)) {
-	    maybe_finalize();
-            op = (ptr_t)GENERAL_MALLOC((word)lb, GC_gcj_kind);
-	    if (0 == op) {
-		UNLOCK();
-		return(GC_oom_fn(lb));
-	    }
-#	    ifdef MERGE_SIZES
-		lw = GC_size_map[lb];	/* May have been uninitialized.	*/
-#	    endif
-        } else {
-            *opp = obj_link(op);
-            GC_words_allocd += lw;
-        }
-	*(void **)op = ptr_to_struct_containing_descr;
-	GC_ASSERT(((void **)op)[1] == 0);
-	UNLOCK();
-    } else {
-	LOCK();
-	maybe_finalize();
-	op = (ptr_t)GENERAL_MALLOC((word)lb, GC_gcj_kind);
-	if (0 == op) {
-	    UNLOCK();
-	    return(GC_oom_fn(lb));
-	}
-	*(void **)op = ptr_to_struct_containing_descr;
-	UNLOCK();
-    }
-    return((GC_PTR) op);
-}
-
-/* Similar to GC_gcj_malloc, but add debug info.  This is allocated	*/
-/* with GC_gcj_debug_kind.						*/
-GC_PTR GC_debug_gcj_malloc(size_t lb, void * ptr_to_struct_containing_descr,
-			   GC_EXTRA_PARAMS)
-{
-    GC_PTR result;
-
-    /* We're careful to avoid extra calls, which could		 */
-    /* confuse the backtrace.					*/
-    LOCK();
-    maybe_finalize();
-    result = GC_generic_malloc_inner(lb + DEBUG_BYTES, GC_gcj_debug_kind);
-    if (result == 0) {
-	UNLOCK();
-        GC_err_printf2("GC_debug_gcj_malloc(%ld, 0x%lx) returning NIL (",
-        	       (unsigned long) lb,
-		       (unsigned long) ptr_to_struct_containing_descr);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return(GC_oom_fn(lb));
-    }
-    *((void **)((ptr_t)result + sizeof(oh))) = ptr_to_struct_containing_descr;
-    UNLOCK();
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-/* Similar to GC_gcj_malloc, but the size is in words, and we don't	*/
-/* adjust it.  The size is assumed to be such that it can be 	*/
-/* allocated as a small object.					*/
-void * GC_gcj_fast_malloc(size_t lw, void * ptr_to_struct_containing_descr)
-{
-ptr_t op;
-ptr_t * opp;
-DCL_LOCK_STATE;
-
-    opp = &(GC_gcjobjfreelist[lw]);
-    LOCK();
-    op = *opp;
-    if( EXPECT(op == 0, 0) ) {
-	maybe_finalize();
-        op = (ptr_t)GC_clear_stack(
-		GC_generic_malloc_words_small_inner(lw, GC_gcj_kind));
-	if (0 == op) {
-	    UNLOCK();
-	    return GC_oom_fn(WORDS_TO_BYTES(lw));
-	}
-    } else {
-        *opp = obj_link(op);
-        GC_words_allocd += lw;
-    }
-    *(void **)op = ptr_to_struct_containing_descr;
-    UNLOCK();
-    return((GC_PTR) op);
-}
-
-/* And a debugging version of the above:	*/
-void * GC_debug_gcj_fast_malloc(size_t lw,
-				void * ptr_to_struct_containing_descr,
-				GC_EXTRA_PARAMS)
-{
-    GC_PTR result;
-    size_t lb = WORDS_TO_BYTES(lw);
-
-    /* We clone the code from GC_debug_gcj_malloc, so that we 	*/
-    /* dont end up with extra frames on the stack, which could	*/
-    /* confuse the backtrace.					*/
-    LOCK();
-    maybe_finalize();
-    result = GC_generic_malloc_inner(lb + DEBUG_BYTES, GC_gcj_debug_kind);
-    if (result == 0) {
-	UNLOCK();
-        GC_err_printf2("GC_debug_gcj_fast_malloc(%ld, 0x%lx) returning NIL (",
-        	       (unsigned long) lw,
-		       (unsigned long) ptr_to_struct_containing_descr);
-        GC_err_puts(s);
-        GC_err_printf1(":%ld)\n", (unsigned long)i);
-        return GC_oom_fn(WORDS_TO_BYTES(lw));
-    }
-    *((void **)((ptr_t)result + sizeof(oh))) = ptr_to_struct_containing_descr;
-    UNLOCK();
-    if (!GC_debugging_started) {
-    	GC_start_debugging();
-    }
-    ADD_CALL_CHAIN(result, ra);
-    return (GC_store_debug_info(result, (word)lb, s, (word)i));
-}
-
-void * GC_gcj_malloc_ignore_off_page(size_t lb,
-				     void * ptr_to_struct_containing_descr) 
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_gcjobjfreelist[lw]);
-	LOCK();
-        if( (op = *opp) == 0 ) {
-	    maybe_finalize();
-            op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_gcj_kind);
-#	    ifdef MERGE_SIZES
-		lw = GC_size_map[lb];	/* May have been uninitialized.	*/
-#	    endif
-        } else {
-            *opp = obj_link(op);
-            GC_words_allocd += lw;
-        }
-	*(void **)op = ptr_to_struct_containing_descr;
-	UNLOCK();
-    } else {
-	LOCK();
-	maybe_finalize();
-        op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_gcj_kind);
-        if (0 != op) {
-          *(void **)op = ptr_to_struct_containing_descr;
-	}
-        UNLOCK();
-    }
-    return((GC_PTR) op);
-}
-
-#else
-
-char GC_no_gcj_support;
-
-#endif  /* GC_GCJ_SUPPORT */
diff --git a/boehm-gc/gcname.c b/boehm-gc/gcname.c
deleted file mode 100644
index e2119d79964..00000000000
--- a/boehm-gc/gcname.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-#include "version.h"
-
-int main()
-{
-    if (GC_ALPHA_VERSION == GC_NOT_ALPHA) {
-	printf("gc%d.%d", GC_VERSION_MAJOR, GC_VERSION_MINOR);
-    } else {
-	printf("gc%d.%dalpha%d", GC_VERSION_MAJOR,
-				 GC_VERSION_MINOR, GC_ALPHA_VERSION);
-    }
-    return 0;
-}
diff --git a/boehm-gc/headers.c b/boehm-gc/headers.c
deleted file mode 100644
index b7be1d84930..00000000000
--- a/boehm-gc/headers.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996 by Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
- 
-/*
- * This implements:
- * 1. allocation of heap block headers
- * 2. A map from addresses to heap block addresses to heap block headers
- *
- * Access speed is crucial.  We implement an index structure based on a 2
- * level tree.
- */
- 
-# include "private/gc_priv.h"
-
-bottom_index * GC_all_bottom_indices = 0;
-				/* Pointer to first (lowest addr) */
-				/* bottom_index.		  */
-
-bottom_index * GC_all_bottom_indices_end = 0;
-				/* Pointer to last (highest addr) */
-				/* bottom_index.		  */
- 
-/* Non-macro version of header location routine */
-hdr * GC_find_header(h)
-ptr_t h;
-{
-#   ifdef HASH_TL
-	register hdr * result;
-	GET_HDR(h, result);
-	return(result);
-#   else
-	return(HDR_INNER(h));
-#   endif
-}
- 
-/* Routines to dynamically allocate collector data structures that will */
-/* never be freed.							 */
- 
-static ptr_t scratch_free_ptr = 0;
- 
-/* GC_scratch_last_end_ptr is end point of last obtained scratch area.  */
-/* GC_scratch_end_ptr is end point of current scratch area.		*/
- 
-ptr_t GC_scratch_alloc(bytes)
-register word bytes;
-{
-    register ptr_t result = scratch_free_ptr;
-
-#   ifdef ALIGN_DOUBLE
-#	define GRANULARITY (2 * sizeof(word))
-#   else
-#	define GRANULARITY sizeof(word)
-#   endif
-    bytes += GRANULARITY-1;
-    bytes &= ~(GRANULARITY-1);
-    scratch_free_ptr += bytes;
-    if (scratch_free_ptr <= GC_scratch_end_ptr) {
-        return(result);
-    }
-    {
-        word bytes_to_get = MINHINCR * HBLKSIZE;
-         
-        if (bytes_to_get <= bytes) {
-          /* Undo the damage, and get memory directly */
-	    bytes_to_get = bytes;
-#	    ifdef USE_MMAP
-		bytes_to_get += GC_page_size - 1;
-		bytes_to_get &= ~(GC_page_size - 1);
-#	    endif
-   	    result = (ptr_t)GET_MEM(bytes_to_get);
-            scratch_free_ptr -= bytes;
-	    GC_scratch_last_end_ptr = result + bytes;
-            return(result);
-        }
-        result = (ptr_t)GET_MEM(bytes_to_get);
-        if (result == 0) {
-#	    ifdef PRINTSTATS
-                GC_printf0("Out of memory - trying to allocate less\n");
-#	    endif
-            scratch_free_ptr -= bytes;
-	    bytes_to_get = bytes;
-#	    ifdef USE_MMAP
-		bytes_to_get += GC_page_size - 1;
-		bytes_to_get &= ~(GC_page_size - 1);
-#	    endif
-            return((ptr_t)GET_MEM(bytes_to_get));
-        }
-        scratch_free_ptr = result;
-        GC_scratch_end_ptr = scratch_free_ptr + bytes_to_get;
-        GC_scratch_last_end_ptr = GC_scratch_end_ptr;
-        return(GC_scratch_alloc(bytes));
-    }
-}
-
-static hdr * hdr_free_list = 0;
-
-/* Return an uninitialized header */
-static hdr * alloc_hdr()
-{
-    register hdr * result;
-    
-    if (hdr_free_list == 0) {
-        result = (hdr *) GC_scratch_alloc((word)(sizeof(hdr)));
-    } else {
-        result = hdr_free_list;
-        hdr_free_list = (hdr *) (result -> hb_next);
-    }
-    return(result);
-}
-
-static void free_hdr(hhdr)
-hdr * hhdr;
-{
-    hhdr -> hb_next = (struct hblk *) hdr_free_list;
-    hdr_free_list = hhdr;
-}
-
-hdr * GC_invalid_header;
-
-#ifdef USE_HDR_CACHE
-  word GC_hdr_cache_hits = 0;
-  word GC_hdr_cache_misses = 0;
-#endif
- 
-void GC_init_headers()
-{
-    register unsigned i;
-    
-    GC_all_nils = (bottom_index *)GC_scratch_alloc((word)sizeof(bottom_index));
-    BZERO(GC_all_nils, sizeof(bottom_index));
-    for (i = 0; i < TOP_SZ; i++) {
-        GC_top_index[i] = GC_all_nils;
-    }
-    GC_invalid_header = alloc_hdr();
-    GC_invalidate_map(GC_invalid_header);
-}
-
-/* Make sure that there is a bottom level index block for address addr  */
-/* Return FALSE on failure.						*/
-static GC_bool get_index(addr)
-word addr;
-{
-    word hi = (word)(addr) >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE);
-    bottom_index * r;
-    bottom_index * p;
-    bottom_index ** prev;
-    bottom_index *pi;
-    
-#   ifdef HASH_TL
-      unsigned i = TL_HASH(hi);
-      bottom_index * old;
-      
-      old = p = GC_top_index[i];
-      while(p != GC_all_nils) {
-          if (p -> key == hi) return(TRUE);
-          p = p -> hash_link;
-      }
-      r = (bottom_index*)GC_scratch_alloc((word)(sizeof (bottom_index)));
-      if (r == 0) return(FALSE);
-      BZERO(r, sizeof (bottom_index));
-      r -> hash_link = old;
-      GC_top_index[i] = r;
-#   else
-      if (GC_top_index[hi] != GC_all_nils) return(TRUE);
-      r = (bottom_index*)GC_scratch_alloc((word)(sizeof (bottom_index)));
-      if (r == 0) return(FALSE);
-      GC_top_index[hi] = r;
-      BZERO(r, sizeof (bottom_index));
-#   endif
-    r -> key = hi;
-    /* Add it to the list of bottom indices */
-      prev = &GC_all_bottom_indices;  	/* pointer to p */
-      pi = 0;				/* bottom_index preceding p */
-      while ((p = *prev) != 0 && p -> key < hi) {
-	pi = p;
-	prev = &(p -> asc_link);
-      }
-      r -> desc_link = pi;
-      if (0 == p) {
-	GC_all_bottom_indices_end = r;
-      } else {
-	p -> desc_link = r;
-      }
-      r -> asc_link = p;
-      *prev = r;
-    return(TRUE);
-}
-
-/* Install a header for block h.	*/
-/* The header is uninitialized.	  	*/
-/* Returns the header or 0 on failure.	*/
-struct hblkhdr * GC_install_header(h)
-register struct hblk * h;
-{
-    hdr * result;
-    
-    if (!get_index((word) h)) return(0);
-    result = alloc_hdr();
-    SET_HDR(h, result);
-#   ifdef USE_MUNMAP
-	result -> hb_last_reclaimed = GC_gc_no;
-#   endif
-    return(result);
-}
-
-/* Set up forwarding counts for block h of size sz */
-GC_bool GC_install_counts(h, sz)
-register struct hblk * h;
-register word sz; /* bytes */
-{
-    register struct hblk * hbp;
-    register int i;
-    
-    for (hbp = h; (char *)hbp < (char *)h + sz; hbp += BOTTOM_SZ) {
-        if (!get_index((word) hbp)) return(FALSE);
-    }
-    if (!get_index((word)h + sz - 1)) return(FALSE);
-    for (hbp = h + 1; (char *)hbp < (char *)h + sz; hbp += 1) {
-        i = HBLK_PTR_DIFF(hbp, h);
-        SET_HDR(hbp, (hdr *)(i > MAX_JUMP? MAX_JUMP : i));
-    }
-    return(TRUE);
-}
-
-/* Remove the header for block h */
-void GC_remove_header(h)
-register struct hblk * h;
-{
-    hdr ** ha;
-    
-    GET_HDR_ADDR(h, ha);
-    free_hdr(*ha);
-    *ha = 0;
-}
-
-/* Remove forwarding counts for h */
-void GC_remove_counts(h, sz)
-register struct hblk * h;
-register word sz; /* bytes */
-{
-    register struct hblk * hbp;
-    
-    for (hbp = h+1; (char *)hbp < (char *)h + sz; hbp += 1) {
-        SET_HDR(hbp, 0);
-    }
-}
-
-/* Apply fn to all allocated blocks */
-/*VARARGS1*/
-void GC_apply_to_all_blocks(fn, client_data)
-void (*fn) GC_PROTO((struct hblk *h, word client_data));
-word client_data;
-{
-    register int j;
-    register bottom_index * index_p;
-    
-    for (index_p = GC_all_bottom_indices; index_p != 0;
-         index_p = index_p -> asc_link) {
-        for (j = BOTTOM_SZ-1; j >= 0;) {
-            if (!IS_FORWARDING_ADDR_OR_NIL(index_p->index[j])) {
-                if (index_p->index[j]->hb_map != GC_invalid_map) {
-                    (*fn)(((struct hblk *)
-                  	      (((index_p->key << LOG_BOTTOM_SZ) + (word)j)
-                  	       << LOG_HBLKSIZE)),
-                          client_data);
-                }
-                j--;
-             } else if (index_p->index[j] == 0) {
-                j--;
-             } else {
-                j -= (word)(index_p->index[j]);
-             }
-         }
-     }
-}
-
-/* Get the next valid block whose address is at least h	*/
-/* Return 0 if there is none.				*/
-struct hblk * GC_next_used_block(h)
-struct hblk * h;
-{
-    register bottom_index * bi;
-    register word j = ((word)h >> LOG_HBLKSIZE) & (BOTTOM_SZ-1);
-    
-    GET_BI(h, bi);
-    if (bi == GC_all_nils) {
-        register word hi = (word)h >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE);
-        bi = GC_all_bottom_indices;
-        while (bi != 0 && bi -> key < hi) bi = bi -> asc_link;
-        j = 0;
-    }
-    while(bi != 0) {
-        while (j < BOTTOM_SZ) {
-	    hdr * hhdr = bi -> index[j];
-            if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-                j++;
-            } else {
-                if (hhdr->hb_map != GC_invalid_map) {
-                    return((struct hblk *)
-                  	      (((bi -> key << LOG_BOTTOM_SZ) + j)
-                  	       << LOG_HBLKSIZE));
-                } else {
-                    j += divHBLKSZ(hhdr -> hb_sz);
-                }
-            }
-        }
-        j = 0;
-        bi = bi -> asc_link;
-    }
-    return(0);
-}
-
-/* Get the last (highest address) block whose address is 	*/
-/* at most h.  Return 0 if there is none.			*/
-/* Unlike the above, this may return a free block.		*/
-struct hblk * GC_prev_block(h)
-struct hblk * h;
-{
-    register bottom_index * bi;
-    register signed_word j = ((word)h >> LOG_HBLKSIZE) & (BOTTOM_SZ-1);
-    
-    GET_BI(h, bi);
-    if (bi == GC_all_nils) {
-        register word hi = (word)h >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE);
-        bi = GC_all_bottom_indices_end;
-        while (bi != 0 && bi -> key > hi) bi = bi -> desc_link;
-        j = BOTTOM_SZ - 1;
-    }
-    while(bi != 0) {
-        while (j >= 0) {
-	    hdr * hhdr = bi -> index[j];
-	    if (0 == hhdr) {
-		--j;
-            } else if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-                j -= (signed_word)hhdr;
-            } else {
-                return((struct hblk *)
-                          (((bi -> key << LOG_BOTTOM_SZ) + j)
-                  	       << LOG_HBLKSIZE));
-            }
-        }
-        j = BOTTOM_SZ - 1;
-        bi = bi -> desc_link;
-    }
-    return(0);
-}
diff --git a/boehm-gc/hpux_test_and_clear.s b/boehm-gc/hpux_test_and_clear.s
deleted file mode 100644
index f09b211404b..00000000000
--- a/boehm-gc/hpux_test_and_clear.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.SPACE $PRIVATE$
-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-	.SPACE $TEXT$
-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-	.IMPORT $global$,DATA
-	.IMPORT $$dyncall,MILLICODE
-	.SPACE $TEXT$
-	.SUBSPA $CODE$
-
-	.align 4
-	.EXPORT GC_test_and_clear,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
-GC_test_and_clear
-	.PROC
-	.CALLINFO FRAME=0,NO_CALLS
-	.ENTRY
-	ldcw,co (%r26),%r28
-	bv,n 0(%r2)
-	.EXIT
-	.PROCEND
diff --git a/boehm-gc/ia64_save_regs_in_stack.s b/boehm-gc/ia64_save_regs_in_stack.s
deleted file mode 100644
index 3b18c0841d0..00000000000
--- a/boehm-gc/ia64_save_regs_in_stack.s
+++ /dev/null
@@ -1,12 +0,0 @@
-        .text
-        .align 16
-        .global GC_save_regs_in_stack
-        .proc GC_save_regs_in_stack
-GC_save_regs_in_stack:
-        .body
-        flushrs
-        ;;
-        mov r8=ar.bsp
-        br.ret.sptk.few rp
-        .endp GC_save_regs_in_stack
-
diff --git a/boehm-gc/if_mach.c b/boehm-gc/if_mach.c
deleted file mode 100644
index 3dcccf21f5a..00000000000
--- a/boehm-gc/if_mach.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Conditionally execute a command based on machine and OS from gcconfig.h */
-
-# include "private/gcconfig.h"
-# include <stdio.h>
-# include <string.h>
-# include <unistd.h>
-
-int main(argc, argv, envp)
-int argc;
-char ** argv;
-char ** envp;
-{
-    if (argc < 4) goto Usage;
-    if (strcmp(MACH_TYPE, argv[1]) != 0) return(0);
-    if (strcmp(OS_TYPE, "") != 0 && strcmp(argv[2], "") != 0
-        && strcmp(OS_TYPE, argv[2]) != 0) return(0);
-    fprintf(stderr, "^^^^Starting command^^^^\n");
-    fflush(stdout);
-    execvp(argv[3], argv+3);
-    perror("Couldn't execute");
-    
-Usage:
-    fprintf(stderr, "Usage: %s mach_type os_type command\n", argv[0]);
-    fprintf(stderr, "Currently mach_type = %s, os_type = %s\n",
-    	    MACH_TYPE, OS_TYPE);
-    return(1);
-}
-
diff --git a/boehm-gc/if_not_there.c b/boehm-gc/if_not_there.c
deleted file mode 100644
index 8691e925920..00000000000
--- a/boehm-gc/if_not_there.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Conditionally execute a command based if the file argv[1] doesn't exist */
-/* Except for execvp, we stick to ANSI C.				   */
-# include "private/gcconfig.h"
-# include <stdio.h>
-# include <stdlib.h>
-# include <unistd.h>
-#ifdef __DJGPP__
-#include <dirent.h>
-#endif /* __DJGPP__ */
-
-int main(argc, argv, envp)
-int argc;
-char ** argv;
-char ** envp;
-{
-    FILE * f;
-#ifdef __DJGPP__
-    DIR * d;
-#endif /* __DJGPP__ */
-    if (argc < 3) goto Usage;
-    if ((f = fopen(argv[1], "rb")) != 0
-        || (f = fopen(argv[1], "r")) != 0) {
-        fclose(f);
-        return(0);
-    }
-#ifdef __DJGPP__
-    if ((d = opendir(argv[1])) != 0) {
-	    closedir(d);
-	    return(0);
-    }
-#endif
-    printf("^^^^Starting command^^^^\n");
-    fflush(stdout);
-    execvp(argv[2], argv+2);
-    exit(1);
-    
-Usage:
-    fprintf(stderr, "Usage: %s file_name command\n", argv[0]);
-    return(1);
-}
-
diff --git a/boehm-gc/include/Makefile.am b/boehm-gc/include/Makefile.am
deleted file mode 100644
index 63aec076056..00000000000
--- a/boehm-gc/include/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dist
-
-noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \
-  gc_pthread_redirects.h gc_cpp.h
-
-
-
diff --git a/boehm-gc/include/Makefile.in b/boehm-gc/include/Makefile.in
deleted file mode 100644
index ad7bbda296f..00000000000
--- a/boehm-gc/include/Makefile.in
+++ /dev/null
@@ -1,459 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = include
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/gc_config.h.in $(srcdir)/gc_ext_config.h.in \
-	$(noinst_HEADERS)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
-	$(top_srcdir)/../config/depstand.m4 \
-	$(top_srcdir)/../config/lead-dot.m4 \
-	$(top_srcdir)/../config/multi.m4 \
-	$(top_srcdir)/../config/no-executables.m4 \
-	$(top_srcdir)/../config/override.m4 \
-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
-	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
-	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-CONFIG_HEADER = gc_config.h gc_ext_config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
-FGREP = @FGREP@
-GC_CFLAGS = @GC_CFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-O0_CFLAGS = @O0_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-THREADCFLAGS = @THREADCFLAGS@
-THREADLIBS = @THREADLIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-addincludes = @addincludes@
-addlibs = @addlibs@
-addobjs = @addobjs@
-addtests = @addtests@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-extra_ldflags_libgc = @extra_ldflags_libgc@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-mkinstalldirs = @mkinstalldirs@
-multi_basedir = @multi_basedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_all = @target_all@
-target_cpu = @target_cpu@
-target_noncanonical = @target_noncanonical@
-target_os = @target_os@
-target_vendor = @target_vendor@
-toolexecdir = @toolexecdir@
-toolexeclibdir = @toolexeclibdir@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign no-dist
-noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \
-  gc_pthread_redirects.h gc_cpp.h
-
-all: gc_config.h gc_ext_config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-gc_config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/gc_config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status include/gc_config.h
-$(srcdir)/gc_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-gc_ext_config.h: stamp-h2
-	@if test ! -f $@; then rm -f stamp-h2; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi
-
-stamp-h2: $(srcdir)/gc_ext_config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h2
-	cd $(top_builddir) && $(SHELL) ./config.status include/gc_ext_config.h
-
-distclean-hdr:
-	-rm -f gc_config.h stamp-h1 gc_ext_config.h stamp-h2
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) gc_config.h.in gc_ext_config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) gc_config.h.in gc_ext_config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) gc_config.h.in gc_ext_config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) gc_config.h.in gc_ext_config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS) gc_config.h gc_ext_config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/boehm-gc/include/cord.h b/boehm-gc/include/cord.h
deleted file mode 100644
index 926089e86fb..00000000000
--- a/boehm-gc/include/cord.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/* 
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * Author: Hans-J. Boehm (boehm@parc.xerox.com)
- */
-/* Boehm, October 5, 1995 4:20 pm PDT */
- 
-/*
- * Cords are immutable character strings.  A number of operations
- * on long cords are much more efficient than their strings.h counterpart.
- * In particular, concatenation takes constant time independent of the length
- * of the arguments.  (Cords are represented as trees, with internal
- * nodes representing concatenation and leaves consisting of either C
- * strings or a functional description of the string.)
- *
- * The following are reasonable applications of cords.  They would perform
- * unacceptably if C strings were used:
- * - A compiler that produces assembly language output by repeatedly
- *   concatenating instructions onto a cord representing the output file.
- * - A text editor that converts the input file to a cord, and then
- *   performs editing operations by producing a new cord representing
- *   the file after echa character change (and keeping the old ones in an
- *   edit history)
- *
- * For optimal performance, cords should be built by
- * concatenating short sections.
- * This interface is designed for maximum compatibility with C strings.
- * ASCII NUL characters may be embedded in cords using CORD_from_fn.
- * This is handled correctly, but CORD_to_char_star will produce a string
- * with embedded NULs when given such a cord. 
- *
- * This interface is fairly big, largely for performance reasons.
- * The most basic constants and functions:
- *
- * CORD - the type of a cord;
- * CORD_EMPTY - empty cord;
- * CORD_len(cord) - length of a cord;
- * CORD_cat(cord1,cord2) - concatenation of two cords;
- * CORD_substr(cord, start, len) - substring (or subcord);
- * CORD_pos i;  CORD_FOR(i, cord) {  ... CORD_pos_fetch(i) ... } -
- *    examine each character in a cord.  CORD_pos_fetch(i) is the char.
- * CORD_fetch(int i) - Retrieve i'th character (slowly).
- * CORD_cmp(cord1, cord2) - compare two cords.
- * CORD_from_file(FILE * f) - turn a read-only file into a cord.
- * CORD_to_char_star(cord) - convert to C string.
- *   (Non-NULL C constant strings are cords.)
- * CORD_printf (etc.) - cord version of printf. Use %r for cords.
- */
-# ifndef CORD_H
-
-# define CORD_H
-# include <stddef.h>
-# include <stdio.h>
-/* Cords have type const char *.  This is cheating quite a bit, and not	*/
-/* 100% portable.  But it means that nonempty character string		*/
-/* constants may be used as cords directly, provided the string is	*/
-/* never modified in place.  The empty cord is represented by, and	*/
-/* can be written as, 0.						*/
-
-typedef const char * CORD;
-
-/* An empty cord is always represented as nil 	*/
-# define CORD_EMPTY 0
-
-/* Is a nonempty cord represented as a C string? */
-#define CORD_IS_STRING(s) (*(s) != '\0')
-
-/* Concatenate two cords.  If the arguments are C strings, they may 	*/
-/* not be subsequently altered.						*/
-CORD CORD_cat(CORD x, CORD y);
-
-/* Concatenate a cord and a C string with known length.  Except for the	*/
-/* empty string case, this is a special case of CORD_cat.  Since the	*/
-/* length is known, it can be faster.					*/
-/* The string y is shared with the resulting CORD.  Hence it should	*/
-/* not be altered by the caller.					*/
-CORD CORD_cat_char_star(CORD x, const char * y, size_t leny);
-
-/* Compute the length of a cord */
-size_t CORD_len(CORD x);
-
-/* Cords may be represented by functions defining the ith character */
-typedef char (* CORD_fn)(size_t i, void * client_data);
-
-/* Turn a functional description into a cord. 	*/
-CORD CORD_from_fn(CORD_fn fn, void * client_data, size_t len);
-
-/* Return the substring (subcord really) of x with length at most n,	*/
-/* starting at position i.  (The initial character has position 0.)	*/
-CORD CORD_substr(CORD x, size_t i, size_t n);
-
-/* Return the argument, but rebalanced to allow more efficient   	*/
-/* character retrieval, substring operations, and comparisons.		*/
-/* This is useful only for cords that were built using repeated 	*/
-/* concatenation.  Guarantees log time access to the result, unless	*/
-/* x was obtained through a large number of repeated substring ops	*/
-/* or the embedded functional descriptions take longer to evaluate.	*/
-/* May reallocate significant parts of the cord.  The argument is not	*/
-/* modified; only the result is balanced.				*/
-CORD CORD_balance(CORD x);
-
-/* The following traverse a cord by applying a function to each 	*/
-/* character.  This is occasionally appropriate, especially where	*/
-/* speed is crucial.  But, since C doesn't have nested functions,	*/
-/* clients of this sort of traversal are clumsy to write.  Consider	*/
-/* the functions that operate on cord positions instead.		*/
-
-/* Function to iteratively apply to individual characters in cord.	*/
-typedef int (* CORD_iter_fn)(char c, void * client_data);
-
-/* Function to apply to substrings of a cord.  Each substring is a 	*/
-/* a C character string, not a general cord.				*/
-typedef int (* CORD_batched_iter_fn)(const char * s, void * client_data);
-# define CORD_NO_FN ((CORD_batched_iter_fn)0)
-
-/* Apply f1 to each character in the cord, in ascending order,		*/
-/* starting at position i. If						*/
-/* f2 is not CORD_NO_FN, then multiple calls to f1 may be replaced by	*/
-/* a single call to f2.  The parameter f2 is provided only to allow	*/
-/* some optimization by the client.  This terminates when the right	*/
-/* end of this string is reached, or when f1 or f2 return != 0.  In the	*/
-/* latter case CORD_iter returns != 0.  Otherwise it returns 0.		*/
-/* The specified value of i must be < CORD_len(x).			*/
-int CORD_iter5(CORD x, size_t i, CORD_iter_fn f1,
-	       CORD_batched_iter_fn f2, void * client_data);
-
-/* A simpler version that starts at 0, and without f2:	*/
-int CORD_iter(CORD x, CORD_iter_fn f1, void * client_data);
-# define CORD_iter(x, f1, cd) CORD_iter5(x, 0, f1, CORD_NO_FN, cd)
-
-/* Similar to CORD_iter5, but end-to-beginning.	No provisions for	*/
-/* CORD_batched_iter_fn.						*/
-int CORD_riter4(CORD x, size_t i, CORD_iter_fn f1, void * client_data);
-
-/* A simpler version that starts at the end:	*/
-int CORD_riter(CORD x, CORD_iter_fn f1, void * client_data);
-
-/* Functions that operate on cord positions.  The easy way to traverse	*/
-/* cords.  A cord position is logically a pair consisting of a cord	*/
-/* and an index into that cord.  But it is much faster to retrieve a	*/
-/* charcter based on a position than on an index.  Unfortunately,	*/
-/* positions are big (order of a few 100 bytes), so allocate them with	*/
-/* caution.								*/
-/* Things in cord_pos.h should be treated as opaque, except as		*/
-/* described below.  Also note that					*/
-/* CORD_pos_fetch, CORD_next and CORD_prev have both macro and function	*/
-/* definitions.  The former may evaluate their argument more than once. */
-# include "private/cord_pos.h"
-
-/*
-	Visible definitions from above:
-	
-	typedef <OPAQUE but fairly big> CORD_pos[1];
-	
-	* Extract the cord from a position:
-	CORD CORD_pos_to_cord(CORD_pos p);
-	
-	* Extract the current index from a position:
-	size_t CORD_pos_to_index(CORD_pos p);
-	
-	* Fetch the character located at the given position:
-	char CORD_pos_fetch(CORD_pos p);
-	
-	* Initialize the position to refer to the given cord and index.
-	* Note that this is the most expensive function on positions:
-	void CORD_set_pos(CORD_pos p, CORD x, size_t i);
-	
-	* Advance the position to the next character.
-	* P must be initialized and valid.
-	* Invalidates p if past end:
-	void CORD_next(CORD_pos p);
-	
-	* Move the position to the preceding character.
-	* P must be initialized and valid.
-	* Invalidates p if past beginning:
-	void CORD_prev(CORD_pos p);
-	
-	* Is the position valid, i.e. inside the cord?
-	int CORD_pos_valid(CORD_pos p);
-*/
-# define CORD_FOR(pos, cord) \
-    for (CORD_set_pos(pos, cord, 0); CORD_pos_valid(pos); CORD_next(pos))
-
-			
-/* An out of memory handler to call.  May be supplied by client.	*/
-/* Must not return.							*/
-extern void (* CORD_oom_fn)(void);
-
-/* Dump the representation of x to stdout in an implementation defined	*/
-/* manner.  Intended for debugging only.				*/
-void CORD_dump(CORD x);
-
-/* The following could easily be implemented by the client.  They are	*/
-/* provided in cordxtra.c for convenience.				*/
-
-/* Concatenate a character to the end of a cord.	*/
-CORD CORD_cat_char(CORD x, char c);
-
-/* Concatenate n cords.	*/
-CORD CORD_catn(int n, /* CORD */ ...);
-
-/* Return the character in CORD_substr(x, i, 1)  	*/
-char CORD_fetch(CORD x, size_t i);
-
-/* Return < 0, 0, or > 0, depending on whether x < y, x = y, x > y	*/
-int CORD_cmp(CORD x, CORD y);
-
-/* A generalization that takes both starting positions for the 		*/
-/* comparison, and a limit on the number of characters to be compared.	*/
-int CORD_ncmp(CORD x, size_t x_start, CORD y, size_t y_start, size_t len);
-
-/* Find the first occurrence of s in x at position start or later.	*/
-/* Return the position of the first character of s in x, or		*/
-/* CORD_NOT_FOUND if there is none.					*/
-size_t CORD_str(CORD x, size_t start, CORD s);
-
-/* Return a cord consisting of i copies of (possibly NUL) c.  Dangerous	*/
-/* in conjunction with CORD_to_char_star.				*/
-/* The resulting representation takes constant space, independent of i.	*/
-CORD CORD_chars(char c, size_t i);
-# define CORD_nul(i) CORD_chars('\0', (i))
-
-/* Turn a file into cord.  The file must be seekable.  Its contents	*/
-/* must remain constant.  The file may be accessed as an immediate	*/
-/* result of this call and/or as a result of subsequent accesses to 	*/
-/* the cord.  Short files are likely to be immediately read, but	*/
-/* long files are likely to be read on demand, possibly relying on 	*/
-/* stdio for buffering.							*/
-/* We must have exclusive access to the descriptor f, i.e. we may	*/
-/* read it at any time, and expect the file pointer to be		*/
-/* where we left it.  Normally this should be invoked as		*/
-/* CORD_from_file(fopen(...))						*/
-/* CORD_from_file arranges to close the file descriptor when it is no	*/
-/* longer needed (e.g. when the result becomes inaccessible).		*/ 
-/* The file f must be such that ftell reflects the actual character	*/
-/* position in the file, i.e. the number of characters that can be 	*/
-/* or were read with fread.  On UNIX systems this is always true.  On	*/
-/* MS Windows systems, f must be opened in binary mode.			*/
-CORD CORD_from_file(FILE * f);
-
-/* Equivalent to the above, except that the entire file will be read	*/
-/* and the file pointer will be closed immediately.			*/
-/* The binary mode restriction from above does not apply.		*/
-CORD CORD_from_file_eager(FILE * f);
-
-/* Equivalent to the above, except that the file will be read on demand.*/
-/* The binary mode restriction applies.					*/
-CORD CORD_from_file_lazy(FILE * f);
-
-/* Turn a cord into a C string.	The result shares no structure with	*/
-/* x, and is thus modifiable.						*/
-char * CORD_to_char_star(CORD x);
-
-/* Turn a C string into a CORD.  The C string is copied, and so may	*/
-/* subsequently be modified.						*/
-CORD CORD_from_char_star(const char *s);
-
-/* Identical to the above, but the result may share structure with	*/
-/* the argument and is thus not modifiable.				*/
-const char * CORD_to_const_char_star(CORD x); 
-
-/* Write a cord to a file, starting at the current position.  No	*/
-/* trailing NULs are newlines are added.				*/
-/* Returns EOF if a write error occurs, 1 otherwise.			*/
-int CORD_put(CORD x, FILE * f);
-
-/* "Not found" result for the following two functions.			*/
-# define CORD_NOT_FOUND ((size_t)(-1))
-
-/* A vague analog of strchr.  Returns the position (an integer, not	*/
-/* a pointer) of the first occurrence of (char) c inside x at position 	*/
-/* i or later. The value i must be < CORD_len(x).			*/
-size_t CORD_chr(CORD x, size_t i, int c);
-
-/* A vague analog of strrchr.  Returns index of the last occurrence	*/
-/* of (char) c inside x at position i or earlier. The value i		*/
-/* must be < CORD_len(x).						*/
-size_t CORD_rchr(CORD x, size_t i, int c);
-
-
-/* The following are also not primitive, but are implemented in 	*/
-/* cordprnt.c.  They provide functionality similar to the ANSI C	*/
-/* functions with corresponding names, but with the following		*/
-/* additions and changes:						*/
-/* 1. A %r conversion specification specifies a CORD argument.  Field	*/
-/*    width, precision, etc. have the same semantics as for %s.		*/
-/*    (Note that %c,%C, and %S were already taken.)			*/
-/* 2. The format string is represented as a CORD.		        */
-/* 3. CORD_sprintf and CORD_vsprintf assign the result through the 1st	*/ 	/*    argument.	Unlike their ANSI C versions, there is no need to guess	*/
-/*    the correct buffer size.						*/
-/* 4. Most of the conversions are implement through the native 		*/
-/*    vsprintf.  Hence they are usually no faster, and 			*/
-/*    idiosyncracies of the native printf are preserved.  However,	*/
-/*    CORD arguments to CORD_sprintf and CORD_vsprintf are NOT copied;	*/
-/*    the result shares the original structure.  This may make them	*/
-/*    very efficient in some unusual applications.			*/
-/*    The format string is copied.					*/
-/* All functions return the number of characters generated or -1 on	*/
-/* error.  This complies with the ANSI standard, but is inconsistent	*/
-/* with some older implementations of sprintf.				*/
-
-/* The implementation of these is probably less portable than the rest	*/
-/* of this package.							*/
-
-#ifndef CORD_NO_IO
-
-#include <stdarg.h>
-
-int CORD_sprintf(CORD * out, CORD format, ...);
-int CORD_vsprintf(CORD * out, CORD format, va_list args);
-int CORD_fprintf(FILE * f, CORD format, ...);
-int CORD_vfprintf(FILE * f, CORD format, va_list args);
-int CORD_printf(CORD format, ...);
-int CORD_vprintf(CORD format, va_list args);
-
-#endif /* CORD_NO_IO */
-
-# endif /* CORD_H */
diff --git a/boehm-gc/include/ec.h b/boehm-gc/include/ec.h
deleted file mode 100644
index c829b83ad11..00000000000
--- a/boehm-gc/include/ec.h
+++ /dev/null
@@ -1,70 +0,0 @@
-# ifndef EC_H
-# define EC_H
-
-# ifndef CORD_H
-#  include "cord.h"
-# endif
-
-/* Extensible cords are strings that may be destructively appended to.	*/
-/* They allow fast construction of cords from characters that are	*/
-/* being read from a stream.						*/
-/*
- * A client might look like:
- *
- *	{
- *	    CORD_ec x;
- *	    CORD result;
- *	    char c;
- *	    FILE *f;
- *
- *	    ...
- *	    CORD_ec_init(x);
- *	    while(...) {
- *		c = getc(f);
- *		...
- *		CORD_ec_append(x, c);
- *	    }
- *	    result = CORD_balance(CORD_ec_to_cord(x));
- *
- * If a C string is desired as the final result, the call to CORD_balance
- * may be replaced by a call to CORD_to_char_star.
- */
-
-# ifndef CORD_BUFSZ
-#   define CORD_BUFSZ 128
-# endif
-
-typedef struct CORD_ec_struct {
-    CORD ec_cord;
-    char * ec_bufptr;
-    char ec_buf[CORD_BUFSZ+1];
-} CORD_ec[1];
-
-/* This structure represents the concatenation of ec_cord with		*/
-/* ec_buf[0 ... (ec_bufptr-ec_buf-1)]					*/
-
-/* Flush the buffer part of the extended chord into ec_cord.	*/
-/* Note that this is almost the only real function, and it is	*/
-/* implemented in 6 lines in cordxtra.c				*/
-void CORD_ec_flush_buf(CORD_ec x);
-      
-/* Convert an extensible cord to a cord. */
-# define CORD_ec_to_cord(x) (CORD_ec_flush_buf(x), (x)[0].ec_cord)
-
-/* Initialize an extensible cord. */
-# define CORD_ec_init(x) ((x)[0].ec_cord = 0, (x)[0].ec_bufptr = (x)[0].ec_buf)
-
-/* Append a character to an extensible cord.	*/
-# define CORD_ec_append(x, c) \
-    {  \
-	if ((x)[0].ec_bufptr == (x)[0].ec_buf + CORD_BUFSZ) { \
-	  	CORD_ec_flush_buf(x); \
-	} \
-	*((x)[0].ec_bufptr)++ = (c); \
-    }
-
-/* Append a cord to an extensible cord.  Structure remains shared with 	*/
-/* original.								*/
-void CORD_ec_append_cord(CORD_ec x, CORD s);
-
-# endif /* EC_H */
diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h
deleted file mode 100644
index 6b38f2d0e6c..00000000000
--- a/boehm-gc/include/gc.h
+++ /dev/null
@@ -1,1083 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright 1999 by Hewlett-Packard Company.  All rights reserved.
- * Copyright (C) 2007 Free Software Foundation, Inc
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * Note that this defines a large number of tuning hooks, which can
- * safely be ignored in nearly all cases.  For normal use it suffices
- * to call only GC_MALLOC and perhaps GC_REALLOC.
- * For better performance, also look at GC_MALLOC_ATOMIC, and
- * GC_enable_incremental.  If you need an action to be performed
- * immediately before an object is collected, look at GC_register_finalizer.
- * If you are using Solaris threads, look at the end of this file.
- * Everything else is best ignored unless you encounter performance
- * problems.
- */
- 
-#ifndef _GC_H
-
-# define _GC_H
-
-/* 
- * As this header includes gc_config.h, preprocessor conflicts can occur with 
- * clients that include their own autoconf headers. The following #undef's 
- * work around some likely conflicts.
- */
-
-# ifdef PACKAGE_NAME
-#   undef PACKAGE_NAME
-# endif
-# ifdef PACKAGE_BUGREPORT
-#  undef PACKAGE_BUGREPORT
-# endif
-# ifdef PACKAGE_STRING
-#  undef PACKAGE_STRING
-# endif
-# ifdef PACKAGE_TARNAME
-#  undef PACKAGE_TARNAME
-# endif
-# ifdef PACKAGE_VERSION
-#  undef PACKAGE_VERSION
-# endif
-
-# include <gc_config.h>
-# include "gc_config_macros.h"
-
-# if defined(__STDC__) || defined(__cplusplus) || defined(_AIX)
-#   define GC_PROTO(args) args
-    typedef void * GC_PTR;
-#   define GC_CONST const
-# else
-#   define GC_PROTO(args) ()
-    typedef char * GC_PTR;
-#   define GC_CONST
-#  endif
-
-# ifdef __cplusplus
-    extern "C" {
-# endif
-
-/* Define word and signed_word to be unsigned and signed types of the 	*/
-/* size as char * or void *.  There seems to be no way to do this	*/
-/* even semi-portably.  The following is probably no better/worse 	*/
-/* than almost anything else.						*/
-/* The ANSI standard suggests that size_t and ptr_diff_t might be 	*/
-/* better choices.  But those had incorrect definitions on some older	*/
-/* systems.  Notably "typedef int size_t" is WRONG.			*/
-#ifndef _WIN64
-  typedef unsigned long GC_word;
-  typedef long GC_signed_word;
-#else
-  /* Win64 isn't really supported yet, but this is the first step. And	*/
-  /* it might cause error messages to show up in more plausible places.	*/
-  /* This needs basetsd.h, which is included by windows.h.	 	*/
-  typedef ULONG_PTR GC_word;
-  typedef LONG_PTR GC_word;
-#endif
-
-/* Public read-only variables */
-
-GC_API GC_word GC_gc_no;/* Counter incremented per collection.  	*/
-			/* Includes empty GCs at startup.		*/
-
-GC_API int GC_parallel;	/* GC is parallelized for performance on	*/
-			/* multiprocessors.  Currently set only		*/
-			/* implicitly if collector is built with	*/
-			/* -DPARALLEL_MARK and if either:		*/
-			/*  Env variable GC_NPROC is set to > 1, or	*/
-			/*  GC_NPROC is not set and this is an MP.	*/
-			/* If GC_parallel is set, incremental		*/
-			/* collection is only partially functional,	*/
-			/* and may not be desirable.			*/
-			
-
-/* Public R/W variables */
-
-GC_API GC_PTR (*GC_oom_fn) GC_PROTO((size_t bytes_requested));
-			/* When there is insufficient memory to satisfy */
-			/* an allocation request, we return		*/
-			/* (*GC_oom_fn)().  By default this just	*/
-			/* returns 0.					*/
-			/* If it returns, it must return 0 or a valid	*/
-			/* pointer to a previously allocated heap 	*/
-			/* object.					*/
-
-GC_API int GC_find_leak;
-			/* Do not actually garbage collect, but simply	*/
-			/* report inaccessible memory that was not	*/
-			/* deallocated with GC_free.  Initial value	*/
-			/* is determined by FIND_LEAK macro.		*/
-
-GC_API int GC_all_interior_pointers;
-			/* Arrange for pointers to object interiors to	*/
-			/* be recognized as valid.  May not be changed	*/
-			/* after GC initialization.			*/
-			/* Initial value is determined by 		*/
-			/* -DALL_INTERIOR_POINTERS.			*/
-			/* Unless DONT_ADD_BYTE_AT_END is defined, this	*/
-			/* also affects whether sizes are increased by	*/
-			/* at least a byte to allow "off the end"	*/
-			/* pointer recognition.				*/
-			/* MUST BE 0 or 1.				*/
-
-GC_API int GC_quiet;	/* Disable statistics output.  Only matters if	*/
-			/* collector has been compiled with statistics	*/
-			/* enabled.  This involves a performance cost,	*/
-			/* and is thus not the default.			*/
-
-GC_API int GC_finalize_on_demand;
-			/* If nonzero, finalizers will only be run in 	*/
-			/* response to an explicit GC_invoke_finalizers	*/
-			/* call.  The default is determined by whether	*/
-			/* the FINALIZE_ON_DEMAND macro is defined	*/
-			/* when the collector is built.			*/
-
-GC_API int GC_java_finalization;
-			/* Mark objects reachable from finalizable 	*/
-			/* objects in a separate postpass.  This makes	*/
-			/* it a bit safer to use non-topologically-	*/
-			/* ordered finalization.  Default value is	*/
-			/* determined by JAVA_FINALIZATION macro.	*/
-
-GC_API void (* GC_finalizer_notifier) GC_PROTO((void));
-			/* Invoked by the collector when there are 	*/
-			/* objects to be finalized.  Invoked at most	*/
-			/* once per GC cycle.  Never invoked unless 	*/
-			/* GC_finalize_on_demand is set.		*/
-			/* Typically this will notify a finalization	*/
-			/* thread, which will call GC_invoke_finalizers */
-			/* in response.					*/
-
-GC_API int GC_dont_gc;	/* != 0 ==> Dont collect.  In versions 6.2a1+,	*/
-			/* this overrides explicit GC_gcollect() calls.	*/
-			/* Used as a counter, so that nested enabling	*/
-			/* and disabling work correctly.  Should	*/
-			/* normally be updated with GC_enable() and	*/
-			/* GC_disable() calls.				*/
-			/* Direct assignment to GC_dont_gc is 		*/
-			/* deprecated.					*/
-
-GC_API int GC_dont_expand;
-			/* Dont expand heap unless explicitly requested */
-			/* or forced to.				*/
-
-GC_API int GC_use_entire_heap;
-		/* Causes the nonincremental collector to use the	*/
-		/* entire heap before collecting.  This was the only 	*/
-		/* option for GC versions < 5.0.  This sometimes	*/
-		/* results in more large block fragmentation, since	*/
-		/* very larg blocks will tend to get broken up		*/
-		/* during each GC cycle.  It is likely to result in a	*/
-		/* larger working set, but lower collection		*/
-		/* frequencies, and hence fewer instructions executed	*/
-		/* in the collector.					*/
-
-GC_API int GC_full_freq;    /* Number of partial collections between	*/
-			    /* full collections.  Matters only if	*/
-			    /* GC_incremental is set.			*/
-			    /* Full collections are also triggered if	*/
-			    /* the collector detects a substantial	*/
-			    /* increase in the number of in-use heap	*/
-			    /* blocks.  Values in the tens are now	*/
-			    /* perfectly reasonable, unlike for		*/
-			    /* earlier GC versions.			*/
-			
-GC_API GC_word GC_non_gc_bytes;
-			/* Bytes not considered candidates for collection. */
-			/* Used only to control scheduling of collections. */
-			/* Updated by GC_malloc_uncollectable and GC_free. */
-			/* Wizards only.				   */
-
-GC_API int GC_no_dls;
-			/* Don't register dynamic library data segments. */
-			/* Wizards only.  Should be used only if the	 */
-			/* application explicitly registers all roots.	 */
-			/* In Microsoft Windows environments, this will	 */
-			/* usually also prevent registration of the	 */
-			/* main data segment as part of the root set.	 */
-
-GC_API GC_word GC_free_space_divisor;
-			/* We try to make sure that we allocate at 	*/
-			/* least N/GC_free_space_divisor bytes between	*/
-			/* collections, where N is the heap size plus	*/
-			/* a rough estimate of the root set size.	*/
-			/* Initially, GC_free_space_divisor = 3.	*/
-			/* Increasing its value will use less space	*/
-			/* but more collection time.  Decreasing it	*/
-			/* will appreciably decrease collection time	*/
-			/* at the expense of space.			*/
-			/* GC_free_space_divisor = 1 will effectively	*/
-			/* disable collections.				*/
-
-GC_API GC_word GC_max_retries;
-			/* The maximum number of GCs attempted before	*/
-			/* reporting out of memory after heap		*/
-			/* expansion fails.  Initially 0.		*/
-			
-
-GC_API char *GC_stackbottom;	/* Cool end of user stack.		*/
-				/* May be set in the client prior to	*/
-				/* calling any GC_ routines.  This	*/
-				/* avoids some overhead, and 		*/
-				/* potentially some signals that can 	*/
-				/* confuse debuggers.  Otherwise the	*/
-				/* collector attempts to set it 	*/
-				/* automatically.			*/
-				/* For multithreaded code, this is the	*/
-				/* cold end of the stack for the	*/
-				/* primordial thread.			*/	
-				
-GC_API int GC_dont_precollect;  /* Don't collect as part of 		*/
-				/* initialization.  Should be set only	*/
-				/* if the client wants a chance to	*/
-				/* manually initialize the root set	*/
-				/* before the first collection.		*/
-				/* Interferes with blacklisting.	*/
-				/* Wizards only.			*/
-
-/* Public procedures */
-
-/* Initialize the collector.  This is only required when using thread-local
- * allocation, since unlike the regular allocation routines, GC_local_malloc
- * is not self-initializing.  If you use GC_local_malloc you should arrange
- * to call this somehow (e.g. from a constructor) before doing any allocation.
- */
-GC_API void GC_init GC_PROTO((void));
-
-GC_API unsigned long GC_time_limit;
-				/* If incremental collection is enabled, */
-				/* We try to terminate collections	 */
-				/* after this many milliseconds.  Not a	 */
-				/* hard time bound.  Setting this to 	 */
-				/* GC_TIME_UNLIMITED will essentially	 */
-				/* disable incremental collection while  */
-				/* leaving generational collection	 */
-				/* enabled.	 			 */
-#	define GC_TIME_UNLIMITED 999999
-				/* Setting GC_time_limit to this value	 */
-				/* will disable the "pause time exceeded"*/
-				/* tests.				 */
-
-/* Public procedures */
-
-/* Initialize the collector.  This is only required when using thread-local
- * allocation, since unlike the regular allocation routines, GC_local_malloc
- * is not self-initializing.  If you use GC_local_malloc you should arrange
- * to call this somehow (e.g. from a constructor) before doing any allocation.
- * For win32 threads, it needs to be called explicitly.
- */
-GC_API void GC_init GC_PROTO((void));
-
-/*
- * general purpose allocation routines, with roughly malloc calling conv.
- * The atomic versions promise that no relevant pointers are contained
- * in the object.  The nonatomic versions guarantee that the new object
- * is cleared.  GC_malloc_stubborn promises that no changes to the object
- * will occur after GC_end_stubborn_change has been called on the
- * result of GC_malloc_stubborn. GC_malloc_uncollectable allocates an object
- * that is scanned for pointers to collectable objects, but is not itself
- * collectable.  The object is scanned even if it does not appear to
- * be reachable.  GC_malloc_uncollectable and GC_free called on the resulting
- * object implicitly update GC_non_gc_bytes appropriately.
- *
- * Note that the GC_malloc_stubborn support is stubbed out by default
- * starting in 6.0.  GC_malloc_stubborn is an alias for GC_malloc unless
- * the collector is built with STUBBORN_ALLOC defined.
- */
-GC_API GC_PTR GC_malloc GC_PROTO((size_t size_in_bytes));
-GC_API GC_PTR GC_malloc_atomic GC_PROTO((size_t size_in_bytes));
-GC_API GC_PTR GC_malloc_uncollectable GC_PROTO((size_t size_in_bytes));
-GC_API GC_PTR GC_malloc_stubborn GC_PROTO((size_t size_in_bytes));
-
-/* The following is only defined if the library has been suitably	*/
-/* compiled:								*/
-GC_API GC_PTR GC_malloc_atomic_uncollectable GC_PROTO((size_t size_in_bytes));
-
-/* Explicitly deallocate an object.  Dangerous if used incorrectly.     */
-/* Requires a pointer to the base of an object.				*/
-/* If the argument is stubborn, it should not be changeable when freed. */
-/* An object should not be enable for finalization when it is 		*/
-/* explicitly deallocated.						*/
-/* GC_free(0) is a no-op, as required by ANSI C for free.		*/
-GC_API void GC_free GC_PROTO((GC_PTR object_addr));
-
-/*
- * Stubborn objects may be changed only if the collector is explicitly informed.
- * The collector is implicitly informed of coming change when such
- * an object is first allocated.  The following routines inform the
- * collector that an object will no longer be changed, or that it will
- * once again be changed.  Only nonNIL pointer stores into the object
- * are considered to be changes.  The argument to GC_end_stubborn_change
- * must be exacly the value returned by GC_malloc_stubborn or passed to
- * GC_change_stubborn.  (In the second case it may be an interior pointer
- * within 512 bytes of the beginning of the objects.)
- * There is a performance penalty for allowing more than
- * one stubborn object to be changed at once, but it is acceptable to
- * do so.  The same applies to dropping stubborn objects that are still
- * changeable.
- */
-GC_API void GC_change_stubborn GC_PROTO((GC_PTR));
-GC_API void GC_end_stubborn_change GC_PROTO((GC_PTR));
-
-/* Return a pointer to the base (lowest address) of an object given	*/
-/* a pointer to a location within the object.				*/
-/* I.e. map an interior pointer to the corresponding bas pointer.	*/
-/* Note that with debugging allocation, this returns a pointer to the	*/
-/* actual base of the object, i.e. the debug information, not to	*/
-/* the base of the user object.						*/
-/* Return 0 if displaced_pointer doesn't point to within a valid	*/
-/* object.								*/
-/* Note that a deallocated object in the garbage collected heap		*/
-/* may be considered valid, even if it has been deallocated with	*/
-/* GC_free.  								*/
-GC_API GC_PTR GC_base GC_PROTO((GC_PTR displaced_pointer));
-
-/* Given a pointer to the base of an object, return its size in bytes.	*/
-/* The returned size may be slightly larger than what was originally	*/
-/* requested.								*/
-GC_API size_t GC_size GC_PROTO((GC_PTR object_addr));
-
-/* For compatibility with C library.  This is occasionally faster than	*/
-/* a malloc followed by a bcopy.  But if you rely on that, either here	*/
-/* or with the standard C library, your code is broken.  In my		*/
-/* opinion, it shouldn't have been invented, but now we're stuck. -HB	*/
-/* The resulting object has the same kind as the original.		*/
-/* If the argument is stubborn, the result will have changes enabled.	*/
-/* It is an error to have changes enabled for the original object.	*/
-/* Follows ANSI comventions for NULL old_object.			*/
-GC_API GC_PTR GC_realloc
-	GC_PROTO((GC_PTR old_object, size_t new_size_in_bytes));
-				   
-/* Explicitly increase the heap size.	*/
-/* Returns 0 on failure, 1 on success.  */
-GC_API int GC_expand_hp GC_PROTO((size_t number_of_bytes));
-
-/* Limit the heap size to n bytes.  Useful when you're debugging, 	*/
-/* especially on systems that don't handle running out of memory well.	*/
-/* n == 0 ==> unbounded.  This is the default.				*/
-GC_API void GC_set_max_heap_size GC_PROTO((GC_word n));
-
-/* Inform the collector that a certain section of statically allocated	*/
-/* memory contains no pointers to garbage collected memory.  Thus it 	*/
-/* need not be scanned.  This is sometimes important if the application */
-/* maps large read/write files into the address space, which could be	*/
-/* mistaken for dynamic library data segments on some systems.		*/
-GC_API void GC_exclude_static_roots GC_PROTO((GC_PTR start, GC_PTR finish));
-
-/* Clear the set of root segments.  Wizards only. */
-GC_API void GC_clear_roots GC_PROTO((void));
-
-/* Add a root segment.  Wizards only. */
-GC_API void GC_add_roots GC_PROTO((char * low_address,
-				   char * high_address_plus_1));
-
-/* Remove a root segment.  Wizards only. */
-GC_API void GC_remove_roots GC_PROTO((char * low_address, 
-    char * high_address_plus_1));
-
-/* Add a displacement to the set of those considered valid by the	*/
-/* collector.  GC_register_displacement(n) means that if p was returned */
-/* by GC_malloc, then (char *)p + n will be considered to be a valid	*/
-/* pointer to p.  N must be small and less than the size of p.		*/
-/* (All pointers to the interior of objects from the stack are		*/
-/* considered valid in any case.  This applies to heap objects and	*/
-/* static data.)							*/
-/* Preferably, this should be called before any other GC procedures.	*/
-/* Calling it later adds to the probability of excess memory		*/
-/* retention.								*/
-/* This is a no-op if the collector has recognition of			*/
-/* arbitrary interior pointers enabled, which is now the default.	*/
-GC_API void GC_register_displacement GC_PROTO((GC_word n));
-
-/* The following version should be used if any debugging allocation is	*/
-/* being done.								*/
-GC_API void GC_debug_register_displacement GC_PROTO((GC_word n));
-
-/* Explicitly trigger a full, world-stop collection. 	*/
-GC_API void GC_gcollect GC_PROTO((void));
-
-/* Trigger a full world-stopped collection.  Abort the collection if 	*/
-/* and when stop_func returns a nonzero value.  Stop_func will be 	*/
-/* called frequently, and should be reasonably fast.  This works even	*/
-/* if virtual dirty bits, and hence incremental collection is not 	*/
-/* available for this architecture.  Collections can be aborted faster	*/
-/* than normal pause times for incremental collection.  However,	*/
-/* aborted collections do no useful work; the next collection needs	*/
-/* to start from the beginning.						*/
-/* Return 0 if the collection was aborted, 1 if it succeeded.		*/
-typedef int (* GC_stop_func) GC_PROTO((void));
-GC_API int GC_try_to_collect GC_PROTO((GC_stop_func stop_func));
-
-/* Return the number of bytes in the heap.  Excludes collector private	*/
-/* data structures.  Includes empty blocks and fragmentation loss.	*/
-/* Includes some pages that were allocated but never written.		*/
-GC_API size_t GC_get_heap_size GC_PROTO((void));
-
-/* Return a lower bound on the number of free bytes in the heap.	*/
-GC_API size_t GC_get_free_bytes GC_PROTO((void));
-
-/* Return the number of bytes allocated since the last collection.	*/
-GC_API size_t GC_get_bytes_since_gc GC_PROTO((void));
-
-/* Return the total number of bytes allocated in this process.		*/
-/* Never decreases, except due to wrapping.				*/
-GC_API size_t GC_get_total_bytes GC_PROTO((void));
-
-/* Disable garbage collection.  Even GC_gcollect calls will be 		*/
-/* ineffective.								*/
-GC_API void GC_disable GC_PROTO((void));
-
-/* Reenable garbage collection.  GC_disable() and GC_enable() calls 	*/
-/* nest.  Garbage collection is enabled if the number of calls to both	*/
-/* both functions is equal.						*/
-GC_API void GC_enable GC_PROTO((void));
-
-/* Enable incremental/generational collection.	*/
-/* Not advisable unless dirty bits are 		*/
-/* available or most heap objects are		*/
-/* pointerfree(atomic) or immutable.		*/
-/* Don't use in leak finding mode.		*/
-/* Ignored if GC_dont_gc is true.		*/
-/* Only the generational piece of this is	*/
-/* functional if GC_parallel is TRUE		*/
-/* or if GC_time_limit is GC_TIME_UNLIMITED.	*/
-/* Causes GC_local_gcj_malloc() to revert to	*/
-/* locked allocation.  Must be called 		*/
-/* before any GC_local_gcj_malloc() calls.	*/
-GC_API void GC_enable_incremental GC_PROTO((void));
-
-/* Does incremental mode write-protect pages?  Returns zero or	*/
-/* more of the following, or'ed together:			*/
-#define GC_PROTECTS_POINTER_HEAP  1 /* May protect non-atomic objs.	*/
-#define GC_PROTECTS_PTRFREE_HEAP  2
-#define GC_PROTECTS_STATIC_DATA   4 /* Curently never.			*/
-#define GC_PROTECTS_STACK	  8 /* Probably impractical.		*/
-
-#define GC_PROTECTS_NONE 0
-GC_API int GC_incremental_protection_needs GC_PROTO((void));
-
-/* Perform some garbage collection work, if appropriate.	*/
-/* Return 0 if there is no more work to be done.		*/
-/* Typically performs an amount of work corresponding roughly	*/
-/* to marking from one page.  May do more work if further	*/
-/* progress requires it, e.g. if incremental collection is	*/
-/* disabled.  It is reasonable to call this in a wait loop	*/
-/* until it returns 0.						*/
-GC_API int GC_collect_a_little GC_PROTO((void));
-
-/* Allocate an object of size lb bytes.  The client guarantees that	*/
-/* as long as the object is live, it will be referenced by a pointer	*/
-/* that points to somewhere within the first 256 bytes of the object.	*/
-/* (This should normally be declared volatile to prevent the compiler	*/
-/* from invalidating this assertion.)  This routine is only useful	*/
-/* if a large array is being allocated.  It reduces the chance of 	*/
-/* accidentally retaining such an array as a result of scanning an	*/
-/* integer that happens to be an address inside the array.  (Actually,	*/
-/* it reduces the chance of the allocator not finding space for such	*/
-/* an array, since it will try hard to avoid introducing such a false	*/
-/* reference.)  On a SunOS 4.X or MS Windows system this is recommended */
-/* for arrays likely to be larger than 100K or so.  For other systems,	*/
-/* or if the collector is not configured to recognize all interior	*/
-/* pointers, the threshold is normally much higher.			*/
-GC_API GC_PTR GC_malloc_ignore_off_page GC_PROTO((size_t lb));
-GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb));
-
-#if defined(__sgi) && !defined(__GNUC__) && _COMPILER_VERSION >= 720
-#   define GC_ADD_CALLER
-#   define GC_RETURN_ADDR (GC_word)__return_address
-#endif
-
-#if defined(__linux__) || defined(__GLIBC__)
-# include <features.h>
-# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-     && !defined(__ia64__)
-#   ifndef GC_HAVE_BUILTIN_BACKTRACE
-#     define GC_HAVE_BUILTIN_BACKTRACE
-#   endif
-# endif
-# if defined(__i386__) || defined(__x86_64__)
-#   define GC_CAN_SAVE_CALL_STACKS
-# endif
-#endif
-
-#if defined(GC_HAVE_BUILTIN_BACKTRACE) && !defined(GC_CAN_SAVE_CALL_STACKS)
-# define GC_CAN_SAVE_CALL_STACKS
-#endif
-
-#if defined(__sparc__)
-#   define GC_CAN_SAVE_CALL_STACKS
-#endif
-
-/* If we're on an a platform on which we can't save call stacks, but	*/
-/* gcc is normally used, we go ahead and define GC_ADD_CALLER.  	*/
-/* We make this decision independent of whether gcc is actually being	*/
-/* used, in order to keep the interface consistent, and allow mixing	*/
-/* of compilers.							*/
-/* This may also be desirable if it is possible but expensive to	*/
-/* retrieve the call chain.						*/
-#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
-     || defined(__FreeBSD__)) & !defined(GC_CAN_SAVE_CALL_STACKS)
-# define GC_ADD_CALLER
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
-    /* gcc knows how to retrieve return address, but we don't know */
-    /* how to generate call stacks.				   */
-#   define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-# else
-    /* Just pass 0 for gcc compatibility. */
-#   define GC_RETURN_ADDR 0
-# endif
-#endif
-
-#ifdef GC_ADD_CALLER
-#  define GC_EXTRAS GC_RETURN_ADDR, __FILE__, __LINE__
-#  define GC_EXTRA_PARAMS GC_word ra, GC_CONST char * s, int i
-#else
-#  define GC_EXTRAS __FILE__, __LINE__
-#  define GC_EXTRA_PARAMS GC_CONST char * s, int i
-#endif
-
-/* Debugging (annotated) allocation.  GC_gcollect will check 		*/
-/* objects allocated in this way for overwrites, etc.			*/
-GC_API GC_PTR GC_debug_malloc
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API GC_PTR GC_debug_malloc_atomic
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API GC_PTR GC_debug_malloc_uncollectable
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API GC_PTR GC_debug_malloc_stubborn
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API GC_PTR GC_debug_malloc_ignore_off_page
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API GC_PTR GC_debug_malloc_atomic_ignore_off_page
-	GC_PROTO((size_t size_in_bytes, GC_EXTRA_PARAMS));
-GC_API void GC_debug_free GC_PROTO((GC_PTR object_addr));
-GC_API GC_PTR GC_debug_realloc
-	GC_PROTO((GC_PTR old_object, size_t new_size_in_bytes,
-  		  GC_EXTRA_PARAMS));
-GC_API void GC_debug_change_stubborn GC_PROTO((GC_PTR));
-GC_API void GC_debug_end_stubborn_change GC_PROTO((GC_PTR));
-
-/* Routines that allocate objects with debug information (like the 	*/
-/* above), but just fill in dummy file and line number information.	*/
-/* Thus they can serve as drop-in malloc/realloc replacements.  This	*/
-/* can be useful for two reasons:  					*/
-/* 1) It allows the collector to be built with DBG_HDRS_ALL defined	*/
-/*    even if some allocation calls come from 3rd party libraries	*/
-/*    that can't be recompiled.						*/
-/* 2) On some platforms, the file and line information is redundant,	*/
-/*    since it can be reconstructed from a stack trace.  On such	*/
-/*    platforms it may be more convenient not to recompile, e.g. for	*/
-/*    leak detection.  This can be accomplished by instructing the	*/
-/*    linker to replace malloc/realloc with these.			*/
-GC_API GC_PTR GC_debug_malloc_replacement GC_PROTO((size_t size_in_bytes));
-GC_API GC_PTR GC_debug_realloc_replacement
-	      GC_PROTO((GC_PTR object_addr, size_t size_in_bytes));
-  			 	 
-# ifdef GC_DEBUG
-#   define GC_MALLOC(sz) GC_debug_malloc(sz, GC_EXTRAS)
-#   define GC_MALLOC_ATOMIC(sz) GC_debug_malloc_atomic(sz, GC_EXTRAS)
-#   define GC_MALLOC_UNCOLLECTABLE(sz) \
-			GC_debug_malloc_uncollectable(sz, GC_EXTRAS)
-#   define GC_MALLOC_IGNORE_OFF_PAGE(sz) \
-			GC_debug_malloc_ignore_off_page(sz, GC_EXTRAS)
-#   define GC_MALLOC_ATOMIC_IGNORE_OFF_PAGE(sz) \
-			GC_debug_malloc_atomic_ignore_off_page(sz, GC_EXTRAS)
-#   define GC_REALLOC(old, sz) GC_debug_realloc(old, sz, GC_EXTRAS)
-#   define GC_FREE(p) GC_debug_free(p)
-#   define GC_REGISTER_FINALIZER(p, f, d, of, od) \
-	GC_debug_register_finalizer(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_IGNORE_SELF(p, f, d, of, od) \
-	GC_debug_register_finalizer_ignore_self(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_NO_ORDER(p, f, d, of, od) \
-	GC_debug_register_finalizer_no_order(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_UNREACHABLE(p, f, d, of, od) \
-	GC_debug_register_finalizer_unreachable(p, f, d, of, od)
-#   define GC_MALLOC_STUBBORN(sz) GC_debug_malloc_stubborn(sz, GC_EXTRAS);
-#   define GC_CHANGE_STUBBORN(p) GC_debug_change_stubborn(p)
-#   define GC_END_STUBBORN_CHANGE(p) GC_debug_end_stubborn_change(p)
-#   define GC_GENERAL_REGISTER_DISAPPEARING_LINK(link, obj) \
-	GC_general_register_disappearing_link(link, GC_base(obj))
-#   define GC_REGISTER_DISPLACEMENT(n) GC_debug_register_displacement(n)
-# else
-#   define GC_MALLOC(sz) GC_malloc(sz)
-#   define GC_MALLOC_ATOMIC(sz) GC_malloc_atomic(sz)
-#   define GC_MALLOC_UNCOLLECTABLE(sz) GC_malloc_uncollectable(sz)
-#   define GC_MALLOC_IGNORE_OFF_PAGE(sz) \
-			GC_malloc_ignore_off_page(sz)
-#   define GC_MALLOC_ATOMIC_IGNORE_OFF_PAGE(sz) \
-			GC_malloc_atomic_ignore_off_page(sz)
-#   define GC_REALLOC(old, sz) GC_realloc(old, sz)
-#   define GC_FREE(p) GC_free(p)
-#   define GC_REGISTER_FINALIZER(p, f, d, of, od) \
-	GC_register_finalizer(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_IGNORE_SELF(p, f, d, of, od) \
-	GC_register_finalizer_ignore_self(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_NO_ORDER(p, f, d, of, od) \
-	GC_register_finalizer_no_order(p, f, d, of, od)
-#   define GC_REGISTER_FINALIZER_UNREACHABLE(p, f, d, of, od) \
-	GC_register_finalizer_unreachable(p, f, d, of, od)
-#   define GC_MALLOC_STUBBORN(sz) GC_malloc_stubborn(sz)
-#   define GC_CHANGE_STUBBORN(p) GC_change_stubborn(p)
-#   define GC_END_STUBBORN_CHANGE(p) GC_end_stubborn_change(p)
-#   define GC_GENERAL_REGISTER_DISAPPEARING_LINK(link, obj) \
-	GC_general_register_disappearing_link(link, obj)
-#   define GC_REGISTER_DISPLACEMENT(n) GC_register_displacement(n)
-# endif
-/* The following are included because they are often convenient, and	*/
-/* reduce the chance for a misspecifed size argument.  But calls may	*/
-/* expand to something syntactically incorrect if t is a complicated	*/
-/* type expression.  							*/
-# define GC_NEW(t) (t *)GC_MALLOC(sizeof (t))
-# define GC_NEW_ATOMIC(t) (t *)GC_MALLOC_ATOMIC(sizeof (t))
-# define GC_NEW_STUBBORN(t) (t *)GC_MALLOC_STUBBORN(sizeof (t))
-# define GC_NEW_UNCOLLECTABLE(t) (t *)GC_MALLOC_UNCOLLECTABLE(sizeof (t))
-
-/* Finalization.  Some of these primitives are grossly unsafe.		*/
-/* The idea is to make them both cheap, and sufficient to build		*/
-/* a safer layer, closer to Modula-3, Java, or PCedar finalization.	*/
-/* The interface represents my conclusions from a long discussion	*/
-/* with Alan Demers, Dan Greene, Carl Hauser, Barry Hayes, 		*/
-/* Christian Jacobi, and Russ Atkinson.  It's not perfect, and		*/
-/* probably nobody else agrees with it.	    Hans-J. Boehm  3/13/92	*/
-typedef void (*GC_finalization_proc)
-  	GC_PROTO((GC_PTR obj, GC_PTR client_data));
-
-GC_API void GC_register_finalizer
-    	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-GC_API void GC_debug_register_finalizer
-    	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-	/* When obj is no longer accessible, invoke		*/
-	/* (*fn)(obj, cd).  If a and b are inaccessible, and	*/
-	/* a points to b (after disappearing links have been	*/
-	/* made to disappear), then only a will be		*/
-	/* finalized.  (If this does not create any new		*/
-	/* pointers to b, then b will be finalized after the	*/
-	/* next collection.)  Any finalizable object that	*/
-	/* is reachable from itself by following one or more	*/
-	/* pointers will not be finalized (or collected).	*/
-	/* Thus cycles involving finalizable objects should	*/
-	/* be avoided, or broken by disappearing links.		*/
-	/* All but the last finalizer registered for an object  */
-	/* is ignored.						*/
-	/* Finalization may be removed by passing 0 as fn.	*/
-	/* Finalizers are implicitly unregistered just before   */
-	/* they are invoked.					*/
-	/* The old finalizer and client data are stored in	*/
-	/* *ofn and *ocd.					*/ 
-	/* Fn is never invoked on an accessible object,		*/
-	/* provided hidden pointers are converted to real 	*/
-	/* pointers only if the allocation lock is held, and	*/
-	/* such conversions are not performed by finalization	*/
-	/* routines.						*/
-	/* If GC_register_finalizer is aborted as a result of	*/
-	/* a signal, the object may be left with no		*/
-	/* finalization, even if neither the old nor new	*/
-	/* finalizer were NULL.					*/
-	/* Obj should be the nonNULL starting address of an 	*/
-	/* object allocated by GC_malloc or friends.		*/
-	/* Note that any garbage collectable object referenced	*/
-	/* by cd will be considered accessible until the	*/
-	/* finalizer is invoked.				*/
-
-/* Another versions of the above follow.  It ignores		*/
-/* self-cycles, i.e. pointers from a finalizable object to	*/
-/* itself.  There is a stylistic argument that this is wrong,	*/
-/* but it's unavoidable for C++, since the compiler may		*/
-/* silently introduce these.  It's also benign in that specific	*/
-/* case.  And it helps if finalizable objects are split to	*/
-/* avoid cycles.						*/
-/* Note that cd will still be viewed as accessible, even if it	*/
-/* refers to the object itself.					*/
-GC_API void GC_register_finalizer_ignore_self
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-GC_API void GC_debug_register_finalizer_ignore_self
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-
-/* Another version of the above.  It ignores all cycles.        */
-/* It should probably only be used by Java implementations.     */
-/* Note that cd will still be viewed as accessible, even if it	*/
-/* refers to the object itself.					*/
-GC_API void GC_register_finalizer_no_order
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-GC_API void GC_debug_register_finalizer_no_order
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-
-/* This is a special finalizer that is useful when an object's  */
-/* finalizer must be run when the object is known to be no      */
-/* longer reachable, not even from other finalizable objects.   */
-/* This can be used in combination with finalizer_no_order so   */
-/* as to release resources that must not be released while an   */
-/* object can still be brought back to life by other            */
-/* finalizers.                                                  */
-GC_API void GC_register_finalizer_unreachable
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-GC_API void GC_debug_register_finalizer_unreachable
-	GC_PROTO((GC_PTR obj, GC_finalization_proc fn, GC_PTR cd,
-		  GC_finalization_proc *ofn, GC_PTR *ocd));
-
-/* The following routine may be used to break cycles between	*/
-/* finalizable objects, thus causing cyclic finalizable		*/
-/* objects to be finalized in the correct order.  Standard	*/
-/* use involves calling GC_register_disappearing_link(&p),	*/
-/* where p is a pointer that is not followed by finalization	*/
-/* code, and should not be considered in determining 		*/
-/* finalization order.						*/
-GC_API int GC_register_disappearing_link GC_PROTO((GC_PTR * /* link */));
-	/* Link should point to a field of a heap allocated 	*/
-	/* object obj.  *link will be cleared when obj is	*/
-	/* found to be inaccessible.  This happens BEFORE any	*/
-	/* finalization code is invoked, and BEFORE any		*/
-	/* decisions about finalization order are made.		*/
-	/* This is useful in telling the finalizer that 	*/
-	/* some pointers are not essential for proper		*/
-	/* finalization.  This may avoid finalization cycles.	*/
-	/* Note that obj may be resurrected by another		*/
-	/* finalizer, and thus the clearing of *link may	*/
-	/* be visible to non-finalization code.  		*/
-	/* There's an argument that an arbitrary action should  */
-	/* be allowed here, instead of just clearing a pointer. */
-	/* But this causes problems if that action alters, or 	*/
-	/* examines connectivity.				*/
-	/* Returns 1 if link was already registered, 0		*/
-	/* otherwise.						*/
-	/* Only exists for backward compatibility.  See below:	*/
-	
-GC_API int GC_general_register_disappearing_link
-	GC_PROTO((GC_PTR * /* link */, GC_PTR obj));
-	/* A slight generalization of the above. *link is	*/
-	/* cleared when obj first becomes inaccessible.  This	*/
-	/* can be used to implement weak pointers easily and	*/
-	/* safely. Typically link will point to a location	*/
-	/* holding a disguised pointer to obj.  (A pointer 	*/
-	/* inside an "atomic" object is effectively  		*/
-	/* disguised.)   In this way soft			*/
-	/* pointers are broken before any object		*/
-	/* reachable from them are finalized.  Each link	*/
-	/* May be registered only once, i.e. with one obj	*/
-	/* value.  This was added after a long email discussion */
-	/* with John Ellis.					*/
-	/* Obj must be a pointer to the first word of an object */
-	/* we allocated.  It is unsafe to explicitly deallocate */
-	/* the object containing link.  Explicitly deallocating */
-	/* obj may or may not cause link to eventually be	*/
-	/* cleared.						*/
-GC_API int GC_unregister_disappearing_link GC_PROTO((GC_PTR * /* link */));
-	/* Returns 0 if link was not actually registered.	*/
-	/* Undoes a registration by either of the above two	*/
-	/* routines.						*/
-
-/* Returns !=0  if GC_invoke_finalizers has something to do. 		*/
-GC_API int GC_should_invoke_finalizers GC_PROTO((void));
-
-GC_API int GC_invoke_finalizers GC_PROTO((void));
-	/* Run finalizers for all objects that are ready to	*/
-	/* be finalized.  Return the number of finalizers	*/
-	/* that were run.  Normally this is also called		*/
-	/* implicitly during some allocations.	If		*/
-	/* GC-finalize_on_demand is nonzero, it must be called	*/
-	/* explicitly.						*/
-
-/* GC_set_warn_proc can be used to redirect or filter warning messages.	*/
-/* p may not be a NULL pointer.						*/
-typedef void (*GC_warn_proc) GC_PROTO((char *msg, GC_word arg));
-GC_API GC_warn_proc GC_set_warn_proc GC_PROTO((GC_warn_proc p));
-    /* Returns old warning procedure.	*/
-
-GC_API GC_word GC_set_free_space_divisor GC_PROTO((GC_word value));
-    /* Set free_space_divisor.  See above for definition.	*/
-    /* Returns old value.					*/
-	
-/* The following is intended to be used by a higher level	*/
-/* (e.g. Java-like) finalization facility.  It is expected	*/
-/* that finalization code will arrange for hidden pointers to	*/
-/* disappear.  Otherwise objects can be accessed after they	*/
-/* have been collected.						*/
-/* Note that putting pointers in atomic objects or in 		*/
-/* nonpointer slots of "typed" objects is equivalent to 	*/
-/* disguising them in this way, and may have other advantages.	*/
-# if defined(I_HIDE_POINTERS) || defined(GC_I_HIDE_POINTERS)
-    typedef GC_word GC_hidden_pointer;
-#   define HIDE_POINTER(p) (~(GC_hidden_pointer)(p))
-#   define REVEAL_POINTER(p) ((GC_PTR)(HIDE_POINTER(p)))
-    /* Converting a hidden pointer to a real pointer requires verifying	*/
-    /* that the object still exists.  This involves acquiring the  	*/
-    /* allocator lock to avoid a race with the collector.		*/
-# endif /* I_HIDE_POINTERS */
-
-typedef GC_PTR (*GC_fn_type) GC_PROTO((GC_PTR client_data));
-GC_API GC_PTR GC_call_with_alloc_lock
-        	GC_PROTO((GC_fn_type fn, GC_PTR client_data));
-
-/* The following routines are primarily intended for use with a 	*/
-/* preprocessor which inserts calls to check C pointer arithmetic.	*/
-/* They indicate failure by invoking the corresponding _print_proc.	*/
-
-/* Check that p and q point to the same object.  		*/
-/* Fail conspicuously if they don't.				*/
-/* Returns the first argument.  				*/
-/* Succeeds if neither p nor q points to the heap.		*/
-/* May succeed if both p and q point to between heap objects.	*/
-GC_API GC_PTR GC_same_obj GC_PROTO((GC_PTR p, GC_PTR q));
-
-/* Checked pointer pre- and post- increment operations.  Note that	*/
-/* the second argument is in units of bytes, not multiples of the	*/
-/* object size.  This should either be invoked from a macro, or the	*/
-/* call should be automatically generated.				*/
-GC_API GC_PTR GC_pre_incr GC_PROTO((GC_PTR *p, size_t how_much));
-GC_API GC_PTR GC_post_incr GC_PROTO((GC_PTR *p, size_t how_much));
-
-/* Check that p is visible						*/
-/* to the collector as a possibly pointer containing location.		*/
-/* If it isn't fail conspicuously.					*/
-/* Returns the argument in all cases.  May erroneously succeed		*/
-/* in hard cases.  (This is intended for debugging use with		*/
-/* untyped allocations.  The idea is that it should be possible, though	*/
-/* slow, to add such a call to all indirect pointer stores.)		*/
-/* Currently useless for multithreaded worlds.				*/
-GC_API GC_PTR GC_is_visible GC_PROTO((GC_PTR p));
-
-/* Check that if p is a pointer to a heap page, then it points to	*/
-/* a valid displacement within a heap object.				*/
-/* Fail conspicuously if this property does not hold.			*/
-/* Uninteresting with GC_all_interior_pointers.				*/
-/* Always returns its argument.						*/
-GC_API GC_PTR GC_is_valid_displacement GC_PROTO((GC_PTR	p));
-
-/* Safer, but slow, pointer addition.  Probably useful mainly with 	*/
-/* a preprocessor.  Useful only for heap pointers.			*/
-#ifdef GC_DEBUG
-#   define GC_PTR_ADD3(x, n, type_of_result) \
-	((type_of_result)GC_same_obj((x)+(n), (x)))
-#   define GC_PRE_INCR3(x, n, type_of_result) \
-	((type_of_result)GC_pre_incr(&(x), (n)*sizeof(*x))
-#   define GC_POST_INCR2(x, type_of_result) \
-	((type_of_result)GC_post_incr(&(x), sizeof(*x))
-#   ifdef __GNUC__
-#       define GC_PTR_ADD(x, n) \
-	    GC_PTR_ADD3(x, n, typeof(x))
-#       define GC_PRE_INCR(x, n) \
-	    GC_PRE_INCR3(x, n, typeof(x))
-#       define GC_POST_INCR(x, n) \
-	    GC_POST_INCR3(x, typeof(x))
-#   else
-	/* We can't do this right without typeof, which ANSI	*/
-	/* decided was not sufficiently useful.  Repeatedly	*/
-	/* mentioning the arguments seems too dangerous to be	*/
-	/* useful.  So does not casting the result.		*/
-#   	define GC_PTR_ADD(x, n) ((x)+(n))
-#   endif
-#else	/* !GC_DEBUG */
-#   define GC_PTR_ADD3(x, n, type_of_result) ((x)+(n))
-#   define GC_PTR_ADD(x, n) ((x)+(n))
-#   define GC_PRE_INCR3(x, n, type_of_result) ((x) += (n))
-#   define GC_PRE_INCR(x, n) ((x) += (n))
-#   define GC_POST_INCR2(x, n, type_of_result) ((x)++)
-#   define GC_POST_INCR(x, n) ((x)++)
-#endif
-
-/* Safer assignment of a pointer to a nonstack location.	*/
-#ifdef GC_DEBUG
-# if defined(__STDC__) || defined(_AIX)
-#   define GC_PTR_STORE(p, q) \
-	(*(void **)GC_is_visible(p) = GC_is_valid_displacement(q))
-# else
-#   define GC_PTR_STORE(p, q) \
-	(*(char **)GC_is_visible(p) = GC_is_valid_displacement(q))
-# endif
-#else /* !GC_DEBUG */
-#   define GC_PTR_STORE(p, q) *((p) = (q))
-#endif
-
-/* Functions called to report pointer checking errors */
-GC_API void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR p, GC_PTR q));
-
-GC_API void (*GC_is_valid_displacement_print_proc)
-	GC_PROTO((GC_PTR p));
-
-GC_API void (*GC_is_visible_print_proc)
-	GC_PROTO((GC_PTR p));
-
-
-/* For pthread support, we generally need to intercept a number of 	*/
-/* thread library calls.  We do that here by macro defining them.	*/
-
-#if !defined(GC_USE_LD_WRAP) && \
-    (defined(GC_PTHREADS) || defined(GC_SOLARIS_THREADS))
-# include "gc_pthread_redirects.h"
-#endif
-
-# if defined(PCR) || defined(GC_SOLARIS_THREADS) || \
-     defined(GC_PTHREADS) || defined(GC_WIN32_THREADS)
-   	/* Any flavor of threads except SRC_M3.	*/
-
-/* Register the current thread as a new thread whose stack(s) should    */
-/* be traced by the GC.  						*/
-/* If a platform does not implicitly do so, this must be called before  */
-/* a thread can allocate garbage collected memory, or assign pointers	*/
-/* to the garbage collected heap.  Once registered, a thread will be	*/
-/* stopped during garbage collections.					*/
-GC_API void GC_register_my_thread GC_PROTO((void));
-
-/* Register the current thread, with the indicated stack base, as	*/
-/* a new thread whose stack(s) should be traced by the GC.  If a 	*/
-/* platform does not implicitly do so, this must be called before a	*/
-/* thread can allocate garbage collected memory, or assign pointers	*/
-/* to the garbage collected heap.  Once registered, a thread will be	*/
-/* stopped during garbage collections.					*/
-GC_API void GC_unregister_my_thread GC_PROTO((void));
-
-GC_API GC_PTR GC_get_thread_stack_base GC_PROTO((void));
-
-/* This returns a list of objects, linked through their first		*/
-/* word.  Its use can greatly reduce lock contention problems, since	*/
-/* the allocation lock can be acquired and released many fewer times.	*/
-/* lb must be large enough to hold the pointer field.			*/
-/* It is used internally by gc_local_alloc.h, which provides a simpler	*/
-/* programming interface on Linux.					*/
-GC_PTR GC_malloc_many(size_t lb);
-#define GC_NEXT(p) (*(GC_PTR *)(p)) 	/* Retrieve the next element	*/
-					/* in returned list.		*/
-extern void GC_thr_init GC_PROTO((void));/* Needed for Solaris/X86	*/
-
-#endif /* THREADS && !SRC_M3 */
-
-/* Register a callback to control the scanning of dynamic libraries.
-   When the GC scans the static data of a dynamic library, it will
-   first call a user-supplied routine with filename of the library and
-   the address and length of the memory region.  This routine should
-   return nonzero if that region should be scanned.  */
-GC_API void GC_register_has_static_roots_callback 
-  (int (*callback)(const char *, void *, size_t));
-
-
-#if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
-# include <windows.h>
-
-  /*
-   * All threads must be created using GC_CreateThread, so that they will be
-   * recorded in the thread table.  For backwards compatibility, this is not
-   * technically true if the GC is built as a dynamic library, since it can
-   * and does then use DllMain to keep track of thread creations.  But new code
-   * should be built to call GC_CreateThread.
-   */
-   GC_API HANDLE WINAPI GC_CreateThread(
-      LPSECURITY_ATTRIBUTES lpThreadAttributes,
-      DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress,
-      LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId );
-
-# if defined(_WIN32_WCE)
-  /*
-   * win32_threads.c implements the real WinMain, which will start a new thread
-   * to call GC_WinMain after initializing the garbage collector.
-   */
-  int WINAPI GC_WinMain(
-      HINSTANCE hInstance,
-      HINSTANCE hPrevInstance,
-      LPWSTR lpCmdLine,
-      int nCmdShow );
-
-#  ifndef GC_BUILD
-#    define WinMain GC_WinMain
-#    define CreateThread GC_CreateThread
-#  endif
-# endif /* defined(_WIN32_WCE) */
-
-#endif /* defined(GC_WIN32_THREADS)  && !cygwin */
-
- /*
-  * Fully portable code should call GC_INIT() from the main program
-  * before making any other GC_ calls.  On most platforms this is a
-  * no-op and the collector self-initializes.  But a number of platforms
-  * make that too hard.
-  */
-#if (defined(sparc) || defined(__sparc)) && defined(sun)
-#   define GC_INIT()
-#else
-# if defined(__CYGWIN32__) || defined (_AIX)
-    /*
-     * Similarly gnu-win32 DLLs need explicit initialization from
-     * the main program, as does AIX.
-     */
-#   ifdef __CYGWIN32__
-      extern int _data_start__[];
-      extern int _data_end__[];
-      extern int _bss_start__[];
-      extern int _bss_end__[];
-#     define GC_MAX(x,y) ((x) > (y) ? (x) : (y))
-#     define GC_MIN(x,y) ((x) < (y) ? (x) : (y))
-#     define GC_DATASTART ((GC_PTR) GC_MIN(_data_start__, _bss_start__))
-#     define GC_DATAEND	 ((GC_PTR) GC_MAX(_data_end__, _bss_end__))
-#     ifdef GC_DLL
-#       define GC_INIT() { GC_add_roots(GC_DATASTART, GC_DATAEND); }
-#     else
-#       define GC_INIT()
-#     endif
-#   endif
-#   if defined(_AIX)
-      extern int _data[], _end[];
-#     define GC_DATASTART ((GC_PTR)((ulong)_data))
-#     define GC_DATAEND ((GC_PTR)((ulong)_end))
-#     define GC_INIT() { GC_add_roots(GC_DATASTART, GC_DATAEND); }
-#   endif
-# else
-#  if defined(__APPLE__) && defined(__MACH__) || defined(GC_WIN32_THREADS)
-#   define GC_INIT() { GC_init(); }
-#  else
-#   define GC_INIT()
-#  endif /* !__MACH && !GC_WIN32_THREADS */
-# endif /* !AIX && !cygwin */
-#endif /* !sparc */
-
-#if !defined(_WIN32_WCE) \
-    && ((defined(_MSDOS) || defined(_MSC_VER)) && (_M_IX86 >= 300) \
-        || defined(_WIN32) && !defined(__CYGWIN32__) && !defined(__CYGWIN__))
-  /* win32S may not free all resources on process exit.  */
-  /* This explicitly deallocates the heap.		 */
-    GC_API void GC_win32_free_heap ();
-#endif
-
-#if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
-  /* Allocation really goes through GC_amiga_allocwrapper_do */
-# include "gc_amiga_redirects.h"
-#endif
-
-#if defined(GC_REDIRECT_TO_LOCAL) && !defined(GC_LOCAL_ALLOC_H)
-#  include  "gc_local_alloc.h"
-#endif
-
-#ifdef __cplusplus
-    }  /* end of extern "C" */
-#endif
-
-/* External thread suspension support. These functions do not implement
- * suspension counts or any other higher-level abstraction. Threads which
- * have been suspended numerous times will resume with the very first call
- * to GC_resume_thread.
- */
-#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-  && !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
-GC_API void GC_suspend_thread GC_PROTO((pthread_t));
-GC_API void GC_resume_thread GC_PROTO((pthread_t));
-GC_API int GC_is_thread_suspended GC_PROTO((pthread_t));
-#endif
-#endif /* _GC_H */
diff --git a/boehm-gc/include/gc_alloc.h b/boehm-gc/include/gc_alloc.h
deleted file mode 100644
index c50a7589646..00000000000
--- a/boehm-gc/include/gc_alloc.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-//
-// This is a C++ header file that is intended to replace the SGI STL
-// alloc.h.  This assumes SGI STL version < 3.0.
-//
-// This assumes the collector has been compiled with -DATOMIC_UNCOLLECTABLE
-// and -DALL_INTERIOR_POINTERS.  We also recommend
-// -DREDIRECT_MALLOC=GC_uncollectable_malloc.
-//
-// Some of this could be faster in the explicit deallocation case.  In particular,
-// we spend too much time clearing objects on the free lists.  That could be avoided.
-//
-// This uses template classes with static members, and hence does not work
-// with g++ 2.7.2 and earlier.
-//
-// This code assumes that the collector itself has been compiled with a
-// compiler that defines __STDC__ .
-//
-
-#include "gc.h"
-
-#ifndef GC_ALLOC_H
-
-#define GC_ALLOC_H
-#define __ALLOC_H	// Prevent inclusion of the default version.  Ugly.
-#define __SGI_STL_ALLOC_H
-#define __SGI_STL_INTERNAL_ALLOC_H
-
-#ifndef __ALLOC
-#   define __ALLOC alloc
-#endif
-
-#include <stddef.h>
-#include <string.h>
-
-// The following is just replicated from the conventional SGI alloc.h:
-
-template<class T, class alloc>
-class simple_alloc {
-
-public:
-    static T *allocate(size_t n)
-                { return 0 == n? 0 : (T*) alloc::allocate(n * sizeof (T)); }
-    static T *allocate(void)
-                { return (T*) alloc::allocate(sizeof (T)); }
-    static void deallocate(T *p, size_t n)
-                { if (0 != n) alloc::deallocate(p, n * sizeof (T)); }
-    static void deallocate(T *p)
-                { alloc::deallocate(p, sizeof (T)); }
-};
-
-#include "gc.h"
-
-// The following need to match collector data structures.
-// We can't include gc_priv.h, since that pulls in way too much stuff.
-// This should eventually be factored out into another include file.
-
-extern "C" {
-    extern void ** const GC_objfreelist_ptr;
-    extern void ** const GC_aobjfreelist_ptr;
-    extern void ** const GC_uobjfreelist_ptr;
-    extern void ** const GC_auobjfreelist_ptr;
-
-    extern void GC_incr_words_allocd(size_t words);
-    extern void GC_incr_mem_freed(size_t words);
-
-    extern char * GC_generic_malloc_words_small(size_t word, int kind);
-}
-
-// Object kinds; must match PTRFREE, NORMAL, UNCOLLECTABLE, and
-// AUNCOLLECTABLE in gc_priv.h.
-
-enum { GC_PTRFREE = 0, GC_NORMAL = 1, GC_UNCOLLECTABLE = 2,
-       GC_AUNCOLLECTABLE = 3 };
-
-enum { GC_max_fast_bytes = 255 };
-
-enum { GC_bytes_per_word = sizeof(char *) };
-
-enum { GC_byte_alignment = 8 };
-
-enum { GC_word_alignment = GC_byte_alignment/GC_bytes_per_word };
-
-inline void * &GC_obj_link(void * p)
-{   return *(void **)p;  }
-
-// Compute a number of words >= n+1 bytes.
-// The +1 allows for pointers one past the end.
-inline size_t GC_round_up(size_t n)
-{
-    return ((n + GC_byte_alignment)/GC_byte_alignment)*GC_word_alignment;
-}
-
-// The same but don't allow for extra byte.
-inline size_t GC_round_up_uncollectable(size_t n)
-{
-    return ((n + GC_byte_alignment - 1)/GC_byte_alignment)*GC_word_alignment;
-}
-
-template <int dummy>
-class GC_aux_template {
-public:
-  // File local count of allocated words.  Occasionally this is
-  // added into the global count.  A separate count is necessary since the
-  // real one must be updated with a procedure call.
-  static size_t GC_words_recently_allocd;
-
-  // Same for uncollectable mmory.  Not yet reflected in either
-  // GC_words_recently_allocd or GC_non_gc_bytes.
-  static size_t GC_uncollectable_words_recently_allocd;
-
-  // Similar counter for explicitly deallocated memory.
-  static size_t GC_mem_recently_freed;
-
-  // Again for uncollectable memory.
-  static size_t GC_uncollectable_mem_recently_freed;
-
-  static void * GC_out_of_line_malloc(size_t nwords, int kind);
-};
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_words_recently_allocd = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_uncollectable_words_recently_allocd = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_mem_recently_freed = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_uncollectable_mem_recently_freed = 0;
-
-template <int dummy>
-void * GC_aux_template<dummy>::GC_out_of_line_malloc(size_t nwords, int kind)
-{
-    GC_words_recently_allocd += GC_uncollectable_words_recently_allocd;
-    GC_non_gc_bytes +=
-                GC_bytes_per_word * GC_uncollectable_words_recently_allocd;
-    GC_uncollectable_words_recently_allocd = 0;
-
-    GC_mem_recently_freed += GC_uncollectable_mem_recently_freed;
-    GC_non_gc_bytes -= 
-                GC_bytes_per_word * GC_uncollectable_mem_recently_freed;
-    GC_uncollectable_mem_recently_freed = 0;
-
-    GC_incr_words_allocd(GC_words_recently_allocd);
-    GC_words_recently_allocd = 0;
-
-    GC_incr_mem_freed(GC_mem_recently_freed);
-    GC_mem_recently_freed = 0;
-
-    return GC_generic_malloc_words_small(nwords, kind);
-}
-
-typedef GC_aux_template<0> GC_aux;
-
-// A fast, single-threaded, garbage-collected allocator
-// We assume the first word will be immediately overwritten.
-// In this version, deallocation is not a noop, and explicit
-// deallocation is likely to help performance.
-template <int dummy>
-class single_client_gc_alloc_template {
-    public:
-     	static void * allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc(n);
-	    flh = GC_objfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_NORMAL);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_words_recently_allocd += nwords;
-	    return op;
-        }
-     	static void * ptr_free_allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_atomic(n);
-	    flh = GC_aobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_PTRFREE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_words_recently_allocd += nwords;
-	    return op;
-        }
-	static void deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes)  {
-		GC_free(p);
-	    } else {
-	        flh = GC_objfreelist_ptr + nwords;
-	        GC_obj_link(p) = *flh;
-		memset((char *)p + GC_bytes_per_word, 0,
-		       GC_bytes_per_word * (nwords - 1));
-	        *flh = p;
-	        GC_aux::GC_mem_recently_freed += nwords;
-	    }
-	}
-	static void ptr_free_deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes) {
-		GC_free(p);
-	    } else {
-	    	flh = GC_aobjfreelist_ptr + nwords;
-	    	GC_obj_link(p) = *flh;
-	    	*flh = p;
-	    	GC_aux::GC_mem_recently_freed += nwords;
-	    }
-	}
-};
-
-typedef single_client_gc_alloc_template<0> single_client_gc_alloc;
-
-// Once more, for uncollectable objects.
-template <int dummy>
-class single_client_alloc_template {
-    public:
-     	static void * allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up_uncollectable(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_uncollectable(n);
-	    flh = GC_uobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_UNCOLLECTABLE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_uncollectable_words_recently_allocd += nwords;
-	    return op;
-        }
-     	static void * ptr_free_allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up_uncollectable(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_atomic_uncollectable(n);
-	    flh = GC_auobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_AUNCOLLECTABLE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_uncollectable_words_recently_allocd += nwords;
-	    return op;
-        }
-	static void deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up_uncollectable(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes)  {
-		GC_free(p);
-	    } else {
-	        flh = GC_uobjfreelist_ptr + nwords;
-	        GC_obj_link(p) = *flh;
-	        *flh = p;
-	        GC_aux::GC_uncollectable_mem_recently_freed += nwords;
-	    }
-	}
-	static void ptr_free_deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up_uncollectable(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes) {
-		GC_free(p);
-	    } else {
-	    	flh = GC_auobjfreelist_ptr + nwords;
-	    	GC_obj_link(p) = *flh;
-	    	*flh = p;
-	    	GC_aux::GC_uncollectable_mem_recently_freed += nwords;
-	    }
-	}
-};
-
-typedef single_client_alloc_template<0> single_client_alloc;
-
-template < int dummy >
-class gc_alloc_template {
-    public:
-     	static void * allocate(size_t n) { return GC_malloc(n); }
-     	static void * ptr_free_allocate(size_t n)
-		{ return GC_malloc_atomic(n); }
-	static void deallocate(void *, size_t) { }
-	static void ptr_free_deallocate(void *, size_t) { }
-};
-
-typedef gc_alloc_template < 0 > gc_alloc;
-
-template < int dummy >
-class alloc_template {
-    public:
-     	static void * allocate(size_t n) { return GC_malloc_uncollectable(n); }
-     	static void * ptr_free_allocate(size_t n)
-		{ return GC_malloc_atomic_uncollectable(n); }
-	static void deallocate(void *p, size_t) { GC_free(p); }
-	static void ptr_free_deallocate(void *p, size_t) { GC_free(p); }
-};
-
-typedef alloc_template < 0 > alloc;
-
-#ifdef _SGI_SOURCE
-
-// We want to specialize simple_alloc so that it does the right thing
-// for all pointerfree types.  At the moment there is no portable way to
-// even approximate that.  The following approximation should work for
-// SGI compilers, and perhaps some others.
-
-# define __GC_SPECIALIZE(T,alloc) \
-class simple_alloc<T, alloc> { \
-public: \
-    static T *allocate(size_t n) \
-	{ return 0 == n? 0 : \
-			 (T*) alloc::ptr_free_allocate(n * sizeof (T)); } \
-    static T *allocate(void) \
-	{ return (T*) alloc::ptr_free_allocate(sizeof (T)); } \
-    static void deallocate(T *p, size_t n) \
-	{ if (0 != n) alloc::ptr_free_deallocate(p, n * sizeof (T)); } \
-    static void deallocate(T *p) \
-	{ alloc::ptr_free_deallocate(p, sizeof (T)); } \
-};
-
-__GC_SPECIALIZE(char, gc_alloc)
-__GC_SPECIALIZE(int, gc_alloc)
-__GC_SPECIALIZE(unsigned, gc_alloc)
-__GC_SPECIALIZE(float, gc_alloc)
-__GC_SPECIALIZE(double, gc_alloc)
-
-__GC_SPECIALIZE(char, alloc)
-__GC_SPECIALIZE(int, alloc)
-__GC_SPECIALIZE(unsigned, alloc)
-__GC_SPECIALIZE(float, alloc)
-__GC_SPECIALIZE(double, alloc)
-
-__GC_SPECIALIZE(char, single_client_gc_alloc)
-__GC_SPECIALIZE(int, single_client_gc_alloc)
-__GC_SPECIALIZE(unsigned, single_client_gc_alloc)
-__GC_SPECIALIZE(float, single_client_gc_alloc)
-__GC_SPECIALIZE(double, single_client_gc_alloc)
-
-__GC_SPECIALIZE(char, single_client_alloc)
-__GC_SPECIALIZE(int, single_client_alloc)
-__GC_SPECIALIZE(unsigned, single_client_alloc)
-__GC_SPECIALIZE(float, single_client_alloc)
-__GC_SPECIALIZE(double, single_client_alloc)
-
-#ifdef __STL_USE_STD_ALLOCATORS
-
-???copy stuff from stl_alloc.h or remove it to a different file ???
-
-#endif /* __STL_USE_STD_ALLOCATORS */
-
-#endif /* _SGI_SOURCE */
-
-#endif /* GC_ALLOC_H */
diff --git a/boehm-gc/include/gc_allocator.h b/boehm-gc/include/gc_allocator.h
deleted file mode 100644
index 200f181efa6..00000000000
--- a/boehm-gc/include/gc_allocator.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 2002
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/*
- * This implements standard-conforming allocators that interact with
- * the garbage collector.  Gc_alloctor<T> allocates garbage-collectable
- * objects of type T.  Traceable_allocator<T> allocates objects that
- * are not temselves garbage collected, but are scanned by the
- * collector for pointers to collectable objects.  Traceable_alloc
- * should be used for explicitly managed STL containers that may
- * point to collectable objects.
- *
- * This code was derived from an earlier version of the GNU C++ standard
- * library, which itself was derived from the SGI STL implementation.
- */
-
-#ifndef GC_ALLOCATOR_H
-
-#define GC_ALLOCATOR_H
-
-#include "gc.h"
-
-#if defined(__GNUC__)
-#  define GC_ATTR_UNUSED __attribute__((unused))
-#else
-#  define GC_ATTR_UNUSED
-#endif
-
-/* First some helpers to allow us to dispatch on whether or not a type
- * is known to be pointerfree.
- * These are private, except that the client may invoke the
- * GC_DECLARE_PTRFREE macro.
- */
-
-struct GC_true_type {};
-struct GC_false_type {};
-
-template <class GC_tp>
-struct GC_type_traits {
-  GC_false_type GC_is_ptr_free;
-};
-
-# define GC_DECLARE_PTRFREE(T) \
-template<> struct GC_type_traits<T> { GC_true_type GC_is_ptr_free; }
-
-GC_DECLARE_PTRFREE(signed char);
-GC_DECLARE_PTRFREE(unsigned char);
-GC_DECLARE_PTRFREE(signed short);
-GC_DECLARE_PTRFREE(unsigned short);
-GC_DECLARE_PTRFREE(signed int);
-GC_DECLARE_PTRFREE(unsigned int);
-GC_DECLARE_PTRFREE(signed long);
-GC_DECLARE_PTRFREE(unsigned long);
-GC_DECLARE_PTRFREE(float);
-GC_DECLARE_PTRFREE(double);
-/* The client may want to add others.	*/
-
-// In the following GC_Tp is GC_true_type iff we are allocating a
-// pointerfree object.
-template <class GC_Tp>
-inline void * GC_selective_alloc(size_t n, GC_Tp) {
-    return GC_MALLOC(n);
-}
-
-template <>
-inline void * GC_selective_alloc<GC_true_type>(size_t n, GC_true_type) {
-    return GC_MALLOC_ATOMIC(n);
-}
-
-/* Now the public gc_allocator<T> class:
- */
-template <class GC_Tp>
-class gc_allocator {
-public:
-  typedef size_t     size_type;
-  typedef ptrdiff_t  difference_type;
-  typedef GC_Tp*       pointer;
-  typedef const GC_Tp* const_pointer;
-  typedef GC_Tp&       reference;
-  typedef const GC_Tp& const_reference;
-  typedef GC_Tp        value_type;
-
-  template <class GC_Tp1> struct rebind {
-    typedef gc_allocator<GC_Tp1> other;
-  };
-
-  gc_allocator()  {}
-# ifndef _MSC_VER
-    // I'm not sure why this is needed here in addition to the following.
-    // The standard specifies it for the standard allocator, but VC++ rejects
-    // it.	-HB
-    gc_allocator(const gc_allocator&) throw() {}
-# endif
-  template <class GC_Tp1> gc_allocator(const gc_allocator<GC_Tp1>&) throw() {}
-  ~gc_allocator() throw() {}
-
-  pointer address(reference GC_x) const { return &GC_x; }
-  const_pointer address(const_reference GC_x) const { return &GC_x; }
-
-  // GC_n is permitted to be 0.  The C++ standard says nothing about what
-  // the return value is when GC_n == 0.
-  GC_Tp* allocate(size_type GC_n, const void* = 0) {
-    GC_type_traits<GC_Tp> traits;
-    return static_cast<GC_Tp *>
-	    (GC_selective_alloc(GC_n * sizeof(GC_Tp),
-			        traits.GC_is_ptr_free));
-  }
-
-  // __p is not permitted to be a null pointer.
-  void deallocate(pointer __p, size_type GC_ATTR_UNUSED GC_n)
-    { GC_FREE(__p); }
-
-  size_type max_size() const throw()
-    { return size_t(-1) / sizeof(GC_Tp); }
-
-  void construct(pointer __p, const GC_Tp& __val) { new(__p) GC_Tp(__val); }
-  void destroy(pointer __p) { __p->~GC_Tp(); }
-};
-
-template<>
-class gc_allocator<void> {
-  typedef size_t      size_type;
-  typedef ptrdiff_t   difference_type;
-  typedef void*       pointer;
-  typedef const void* const_pointer;
-  typedef void        value_type;
-
-  template <class GC_Tp1> struct rebind {
-    typedef gc_allocator<GC_Tp1> other;
-  };
-};
-
-
-template <class GC_T1, class GC_T2>
-inline bool operator==(const gc_allocator<GC_T1>&, const gc_allocator<GC_T2>&)
-{
-  return true;
-}
-
-template <class GC_T1, class GC_T2>
-inline bool operator!=(const gc_allocator<GC_T1>&, const gc_allocator<GC_T2>&)
-{
-  return false;
-}
-
-/*
- * And the public traceable_allocator class.
- */
-
-// Note that we currently don't specialize the pointer-free case, since a
-// pointer-free traceable container doesn't make that much sense,
-// though it could become an issue due to abstraction boundaries.
-template <class GC_Tp>
-class traceable_allocator {
-public:
-  typedef size_t     size_type;
-  typedef ptrdiff_t  difference_type;
-  typedef GC_Tp*       pointer;
-  typedef const GC_Tp* const_pointer;
-  typedef GC_Tp&       reference;
-  typedef const GC_Tp& const_reference;
-  typedef GC_Tp        value_type;
-
-  template <class GC_Tp1> struct rebind {
-    typedef traceable_allocator<GC_Tp1> other;
-  };
-
-  traceable_allocator() throw() {}
-# ifndef _MSC_VER
-    traceable_allocator(const traceable_allocator&) throw() {}
-# endif
-  template <class GC_Tp1> traceable_allocator
-	  (const traceable_allocator<GC_Tp1>&) throw() {}
-  ~traceable_allocator() throw() {}
-
-  pointer address(reference GC_x) const { return &GC_x; }
-  const_pointer address(const_reference GC_x) const { return &GC_x; }
-
-  // GC_n is permitted to be 0.  The C++ standard says nothing about what
-  // the return value is when GC_n == 0.
-  GC_Tp* allocate(size_type GC_n, const void* = 0) {
-    return static_cast<GC_Tp*>(GC_MALLOC_UNCOLLECTABLE(GC_n * sizeof(GC_Tp)));
-  }
-
-  // __p is not permitted to be a null pointer.
-  void deallocate(pointer __p, size_type GC_ATTR_UNUSED GC_n)
-    { GC_FREE(__p); }
-
-  size_type max_size() const throw()
-    { return size_t(-1) / sizeof(GC_Tp); }
-
-  void construct(pointer __p, const GC_Tp& __val) { new(__p) GC_Tp(__val); }
-  void destroy(pointer __p) { __p->~GC_Tp(); }
-};
-
-template<>
-class traceable_allocator<void> {
-  typedef size_t      size_type;
-  typedef ptrdiff_t   difference_type;
-  typedef void*       pointer;
-  typedef const void* const_pointer;
-  typedef void        value_type;
-
-  template <class GC_Tp1> struct rebind {
-    typedef traceable_allocator<GC_Tp1> other;
-  };
-};
-
-
-template <class GC_T1, class GC_T2>
-inline bool operator==(const traceable_allocator<GC_T1>&, const traceable_allocator<GC_T2>&)
-{
-  return true;
-}
-
-template <class GC_T1, class GC_T2>
-inline bool operator!=(const traceable_allocator<GC_T1>&, const traceable_allocator<GC_T2>&)
-{
-  return false;
-}
-
-#endif /* GC_ALLOCATOR_H */
diff --git a/boehm-gc/include/gc_amiga_redirects.h b/boehm-gc/include/gc_amiga_redirects.h
deleted file mode 100644
index 9e975c8c832..00000000000
--- a/boehm-gc/include/gc_amiga_redirects.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef GC_AMIGA_REDIRECTS_H
-
-# define GC_AMIGA_REDIRECTS_H
-
-# if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
-    extern void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes);
-#   define GC_realloc(a,b) GC_amiga_realloc(a,b)
-    extern void GC_amiga_set_toany(void (*func)(void));
-    extern int GC_amiga_free_space_divisor_inc;
-    extern void *(*GC_amiga_allocwrapper_do) \
-	(size_t size,void *(*AllocFunction)(size_t size2));
-#   define GC_malloc(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc)
-#   define GC_malloc_atomic(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic)
-#   define GC_malloc_uncollectable(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_uncollectable)
-#   define GC_malloc_stubborn(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_stubborn)
-#   define GC_malloc_atomic_uncollectable(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_uncollectable)
-#   define GC_malloc_ignore_off_page(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_ignore_off_page)
-#   define GC_malloc_atomic_ignore_off_page(a) \
-	(*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_ignore_off_page)
-# endif /* _AMIGA && !GC_AMIGA_MAKINGLIB */
-
-#endif /* GC_AMIGA_REDIRECTS_H */
-
-
diff --git a/boehm-gc/include/gc_backptr.h b/boehm-gc/include/gc_backptr.h
deleted file mode 100644
index 5899496e0fe..00000000000
--- a/boehm-gc/include/gc_backptr.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This is a simple API to implement pointer back tracing, i.e.
- * to answer questions such as "who is pointing to this" or
- * "why is this object being retained by the collector"
- *
- * This API assumes that we have an ANSI C compiler.
- *
- * Most of these calls yield useful information on only after
- * a garbage collection.  Usually the client will first force
- * a full collection and then gather information, preferably
- * before much intervening allocation.
- *
- * The implementation of the interface is only about 99.9999%
- * correct.  It is intended to be good enough for profiling,
- * but is not intended to be used with production code.
- *
- * Results are likely to be much more useful if all allocation is
- * accomplished through the debugging allocators.
- *
- * The implementation idea is due to A. Demers.
- */
-
-#ifndef GC_BACKPTR_H
-#define GC_BACKPTR_H
-/* Store information about the object referencing dest in *base_p     */
-/* and *offset_p.                                                     */
-/* If multiple objects or roots point to dest, the one reported	      */
-/* will be the last on used by the garbage collector to trace the     */
-/* object.							      */
-/*   source is root ==> *base_p = address, *offset_p = 0	      */
-/*   source is heap object ==> *base_p != 0, *offset_p = offset       */
-/*   Returns 1 on success, 0 if source couldn't be determined.        */
-/* Dest can be any address within a heap object.                      */
-typedef enum {  GC_UNREFERENCED, /* No reference info available.	*/
-		GC_NO_SPACE,	/* Dest not allocated with debug alloc  */
-		GC_REFD_FROM_ROOT, /* Referenced directly by root *base_p */
-		GC_REFD_FROM_REG,  /* Referenced from a register, i.e.	*/
-				   /* a root without an address.	*/
-		GC_REFD_FROM_HEAP, /* Referenced from another heap obj. */
-		GC_FINALIZER_REFD /* Finalizable and hence accessible.  */
-} GC_ref_kind;
-
-GC_ref_kind GC_get_back_ptr_info(void *dest, void **base_p, size_t *offset_p);
-
-/* Generate a random heap address.            */
-/* The resulting address is in the heap, but  */
-/* not necessarily inside a valid object.     */
-void * GC_generate_random_heap_address(void);
-
-/* Generate a random address inside a valid marked heap object. */
-void * GC_generate_random_valid_address(void);
-
-/* Force a garbage collection and generate a backtrace from a */
-/* random heap address.                                       */
-/* This uses the GC logging mechanism (GC_printf) to produce  */
-/* output.  It can often be called from a debugger.  The      */
-/* source in dbg_mlc.c also serves as a sample client.	      */
-void GC_generate_random_backtrace(void);
-
-/* Print a backtrace from a specific address.  Used by the 	*/
-/* above.  The client should call GC_gcollect() immediately	*/
-/* before invocation.						*/
-void GC_print_backtrace(void *);
-
-#endif /* GC_BACKPTR_H */
diff --git a/boehm-gc/include/gc_config.h.in b/boehm-gc/include/gc_config.h.in
deleted file mode 100644
index 7ef9822c578..00000000000
--- a/boehm-gc/include/gc_config.h.in
+++ /dev/null
@@ -1,186 +0,0 @@
-/* include/gc_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* allows all pointers to the interior of objects to be recognized */
-#undef ALL_INTERIOR_POINTERS
-
-/* include code for GC_malloc_atomic_uncollectable */
-#undef ATOMIC_UNCOLLECTABLE
-
-/* No description */
-#undef DATASTART_IS_ETEXT
-
-/* Make sure that all objects have debug headers */
-#undef DBG_HDRS_ALL
-
-/* Target is ECOS */
-#undef ECOS
-
-/* support AIX threads */
-#undef GC_AIX_THREADS
-
-/* support for Mac OS X pthreads */
-#undef GC_DARWIN_THREADS
-
-/* support FreeBSD threads */
-#undef GC_FREEBSD_THREADS
-
-/* include support for gcj */
-#undef GC_GCJ_SUPPORT
-
-/* support GNU threads */
-#undef GC_GNU_THREADS
-
-/* enables support for HP/UX 11 pthreads */
-#undef GC_HPUX_THREADS
-
-/* support for Irix pthreads */
-#undef GC_IRIX_THREADS
-
-/* support for Xavier Leroy's Linux threads */
-#undef GC_LINUX_THREADS
-
-/* support for Tru64 pthreads */
-#undef GC_OSF1_THREADS
-
-/* support for Solaris pthreads */
-#undef GC_SOLARIS_PTHREADS
-
-/* support for win32 threads */
-#undef GC_WIN32_THREADS
-
-/* ppc_thread_state64_t has field r0 */
-#undef HAS_PPC_THREAD_STATE64_R0
-
-/* ppc_thread_state64_t has field __r0 */
-#undef HAS_PPC_THREAD_STATE64___R0
-
-/* ppc_thread_state_t has field r0 */
-#undef HAS_PPC_THREAD_STATE_R0
-
-/* ppc_thread_state_t has field __r0 */
-#undef HAS_PPC_THREAD_STATE___R0
-
-/* x86_thread_state32_t has field eax */
-#undef HAS_X86_THREAD_STATE32_EAX
-
-/* x86_thread_state32_t has field __eax */
-#undef HAS_X86_THREAD_STATE32___EAX
-
-/* x86_thread_state64_t has field rax */
-#undef HAS_X86_THREAD_STATE64_RAX
-
-/* x86_thread_state64_t has field __rax */
-#undef HAS_X86_THREAD_STATE64___RAX
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `pthread_getattr_np' function. */
-#undef HAVE_PTHREAD_GETATTR_NP
-
-/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
-#undef HAVE_PTHREAD_GET_STACKADDR_NP
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* make it somewhat safer to finalize objects out of order */
-#undef JAVA_FINALIZATION
-
-/* Add code to save back pointers */
-#undef KEEP_BACK_PTRS
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Enable GC_PRINT_BACK_HEIGHT environment variable */
-#undef MAKE_BACK_GRAPH
-
-/* cause some or all of the heap to not have execute permission */
-#undef NO_EXECUTE_PERMISSION
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* does not disable signals */
-#undef NO_SIGNALS
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* allow the marker to run in multiple threads */
-#undef PARALLEL_MARK
-
-/* number of call frames saved with objects allocated through the debugging
-   interface */
-#undef SAVE_CALL_COUNT
-
-/* disables statistics printing */
-#undef SILENT
-
-/* PROC_VDB in Solaris 2.5 gives wrong values for dirty bits */
-#undef SOLARIS25_PROC_VDB_BUG_FIXED
-
-/* No description */
-#undef STACKBASE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Avoid Solaris 5.3 dynamic library bug */
-#undef SUNOS53_SHARED_LIB
-
-/* define GC_local_malloc() & GC_local_malloc_atomic() */
-#undef THREAD_LOCAL_ALLOC
-
-/* use tls for boehm */
-#undef USE_COMPILER_TLS
-
-/* use MMAP instead of sbrk to get new memory */
-#undef USE_MMAP
-
-/* POSIX version of C Source */
-#undef _POSIX_C_SOURCE
-
-/* Required define if using POSIX threads */
-#undef _REENTRANT
diff --git a/boehm-gc/include/gc_config_macros.h b/boehm-gc/include/gc_config_macros.h
deleted file mode 100644
index a01da4a1342..00000000000
--- a/boehm-gc/include/gc_config_macros.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * This should never be included directly.  It is included only from gc.h.
- * We separate it only to make gc.h more suitable as documentation.
- */
-#if !defined(_REENTRANT) && (defined(GC_SOLARIS_THREADS) \
-		             || defined(GC_SOLARIS_PTHREADS) \
-			     || defined(GC_HPUX_THREADS) \
-			     || defined(GC_AIX_THREADS) \
-			     || defined(GC_LINUX_THREADS) \
-			     || defined(GC_GNU_THREADS))
-# define _REENTRANT
-	/* Better late than never.  This fails if system headers that	*/
-	/* depend on this were previously included.			*/
-#endif
-
-#if defined(GC_DGUX386_THREADS) && !defined(_POSIX4A_DRAFT10_SOURCE)
-# define _POSIX4A_DRAFT10_SOURCE 1
-#endif
-
-# if defined(GC_SOLARIS_PTHREADS) || defined(GC_FREEBSD_THREADS) || \
-	defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \
-	defined(GC_GNU_THREADS) || \
-	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
-	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
-	defined(GC_AIX_THREADS) || \
-        (defined(GC_WIN32_THREADS) && defined(__CYGWIN__))
-#   define GC_PTHREADS
-# endif
-
-#if defined(GC_THREADS) && !defined(GC_PTHREADS)
-# if defined(__linux__)
-#   define GC_LINUX_THREADS
-#   define GC_PTHREADS
-# endif
-# if !defined(LINUX) && (defined(_PA_RISC1_1) || defined(_PA_RISC2_0) \
-                         || defined(hppa) || defined(__HPPA))
-#   define GC_HPUX_THREADS
-#   define GC_PTHREADS
-# endif
-# if !defined(__linux__) && (defined(__alpha) || defined(__alpha__))
-#   define GC_OSF1_THREADS
-#   define GC_PTHREADS
-# endif
-# if defined(__mips) && !defined(__linux__)
-#   define GC_IRIX_THREADS
-#   define GC_PTHREADS
-# endif
-# if defined(__sparc) && !defined(__linux__)
-#   define GC_SOLARIS_PTHREADS
-#   define GC_PTHREADS
-# endif
-# if defined(__APPLE__) && defined(__MACH__) && defined(__ppc__)
-#   define GC_DARWIN_THREADS
-#   define GC_PTHREADS
-# endif
-# if !defined(GC_PTHREADS) && defined(__FreeBSD__)
-#   define GC_FREEBSD_THREADS
-#   define GC_PTHREADS
-# endif
-# if defined(DGUX) && (defined(i386) || defined(__i386__))
-#   define GC_DGUX386_THREADS
-#   define GC_PTHREADS
-# endif
-# if defined(_AIX)
-#   define GC_AIX_THREADS
-#   define GC_PTHREADS
-# endif
-#endif /* GC_THREADS */
-
-#if defined(GC_THREADS) && !defined(GC_PTHREADS) && \
-    (defined(_WIN32) || defined(_MSC_VER) || defined(__CYGWIN__) \
-     || defined(__MINGW32__) || defined(__BORLANDC__) \
-     || defined(_WIN32_WCE))
-# define GC_WIN32_THREADS
-#endif
-
-# define __GC
-# ifndef _WIN32_WCE
-#   include <stddef.h>
-# else /* ! _WIN32_WCE */
-/* Yet more kluges for WinCE */
-#   include <stdlib.h>		/* size_t is defined here */
-    typedef long ptrdiff_t;	/* ptrdiff_t is not defined */
-# endif
-
-#if ((defined(_DLL) && !defined (__MINGW32__)) \
-     || (defined (DLL_EXPORT) && defined (GC_BUILD))) \
-    && !defined(GC_DLL)
-# define GC_DLL
-#endif
-
-#if defined(__MINGW32__) && defined(GC_DLL)
-# ifdef GC_BUILD
-#   define GC_API __declspec(dllexport)
-# else
-#   define GC_API __declspec(dllimport)
-# endif
-#endif
-
-#if (defined(__DMC__) || defined(_MSC_VER)) && defined(GC_DLL)
-# ifdef GC_BUILD
-#   define GC_API extern __declspec(dllexport)
-# else
-#   define GC_API __declspec(dllimport)
-# endif
-#endif
-
-#if defined(__WATCOMC__) && defined(GC_DLL)
-# ifdef GC_BUILD
-#   define GC_API extern __declspec(dllexport)
-# else
-#   define GC_API extern __declspec(dllimport)
-# endif
-#endif
-
-#ifndef GC_API
-#define GC_API extern
-#endif
-
diff --git a/boehm-gc/include/gc_cpp.h b/boehm-gc/include/gc_cpp.h
deleted file mode 100644
index 4f56f0d965f..00000000000
--- a/boehm-gc/include/gc_cpp.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef GC_CPP_H
-#define GC_CPP_H
-/****************************************************************************
-Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- 
-THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- 
-Permission is hereby granted to use or copy this program for any
-purpose, provided the above notices are retained on all copies.
-Permission to modify the code and to distribute modified code is
-granted, provided the above notices are retained, and a notice that
-the code was modified is included with the above copyright notice.
-****************************************************************************
-
-C++ Interface to the Boehm Collector
-
-    John R. Ellis and Jesse Hull 
-
-This interface provides access to the Boehm collector.  It provides
-basic facilities similar to those described in "Safe, Efficient
-Garbage Collection for C++", by John R. Elis and David L. Detlefs
-(ftp://ftp.parc.xerox.com/pub/ellis/gc).
-
-All heap-allocated objects are either "collectable" or
-"uncollectable".  Programs must explicitly delete uncollectable
-objects, whereas the garbage collector will automatically delete
-collectable objects when it discovers them to be inaccessible.
-Collectable objects may freely point at uncollectable objects and vice
-versa.
-
-Objects allocated with the built-in "::operator new" are uncollectable.
-
-Objects derived from class "gc" are collectable.  For example:
-
-    class A: public gc {...};
-    A* a = new A;       // a is collectable. 
-
-Collectable instances of non-class types can be allocated using the GC
-(or UseGC) placement:
-
-    typedef int A[ 10 ];
-    A* a = new (GC) A;
-
-Uncollectable instances of classes derived from "gc" can be allocated
-using the NoGC placement:
-
-    class A: public gc {...};
-    A* a = new (NoGC) A;   // a is uncollectable.
-
-Both uncollectable and collectable objects can be explicitly deleted
-with "delete", which invokes an object's destructors and frees its
-storage immediately.
-
-A collectable object may have a clean-up function, which will be
-invoked when the collector discovers the object to be inaccessible.
-An object derived from "gc_cleanup" or containing a member derived
-from "gc_cleanup" has a default clean-up function that invokes the
-object's destructors.  Explicit clean-up functions may be specified as
-an additional placement argument:
-
-    A* a = ::new (GC, MyCleanup) A;
-
-An object is considered "accessible" by the collector if it can be
-reached by a path of pointers from static variables, automatic
-variables of active functions, or from some object with clean-up
-enabled; pointers from an object to itself are ignored.
-
-Thus, if objects A and B both have clean-up functions, and A points at
-B, B is considered accessible.  After A's clean-up is invoked and its
-storage released, B will then become inaccessible and will have its
-clean-up invoked.  If A points at B and B points to A, forming a
-cycle, then that's considered a storage leak, and neither will be
-collectable.  See the interface gc.h for low-level facilities for
-handling such cycles of objects with clean-up.
-
-The collector cannot guarantee that it will find all inaccessible
-objects.  In practice, it finds almost all of them.
-
-
-Cautions:
-
-1. Be sure the collector has been augmented with "make c++".
-
-2.  If your compiler supports the new "operator new[]" syntax, then
-add -DGC_OPERATOR_NEW_ARRAY to the Makefile.
-
-If your compiler doesn't support "operator new[]", beware that an
-array of type T, where T is derived from "gc", may or may not be
-allocated as a collectable object (it depends on the compiler).  Use
-the explicit GC placement to make the array collectable.  For example:
-
-    class A: public gc {...};
-    A* a1 = new A[ 10 ];        // collectable or uncollectable?
-    A* a2 = new (GC) A[ 10 ];   // collectable
-
-3. The destructors of collectable arrays of objects derived from
-"gc_cleanup" will not be invoked properly.  For example:
-
-    class A: public gc_cleanup {...};
-    A* a = new (GC) A[ 10 ];    // destructors not invoked correctly
-
-Typically, only the destructor for the first element of the array will
-be invoked when the array is garbage-collected.  To get all the
-destructors of any array executed, you must supply an explicit
-clean-up function:
-
-    A* a = new (GC, MyCleanUp) A[ 10 ];
-
-(Implementing clean-up of arrays correctly, portably, and in a way
-that preserves the correct exception semantics requires a language
-extension, e.g. the "gc" keyword.)
-
-4. Compiler bugs:
-
-* Solaris 2's CC (SC3.0) doesn't implement t->~T() correctly, so the
-destructors of classes derived from gc_cleanup won't be invoked.
-You'll have to explicitly register a clean-up function with
-new-placement syntax.
-
-* Evidently cfront 3.0 does not allow destructors to be explicitly
-invoked using the ANSI-conforming syntax t->~T().  If you're using
-cfront 3.0, you'll have to comment out the class gc_cleanup, which
-uses explicit invocation.
-
-5. GC name conflicts:
-
-Many other systems seem to use the identifier "GC" as an abbreviation
-for "Graphics Context".  Since version 5.0, GC placement has been replaced
-by UseGC.  GC is an alias for UseGC, unless GC_NAME_CONFLICT is defined.
-
-****************************************************************************/
-
-#include "gc.h"
-
-#ifndef THINK_CPLUS
-#  define GC_cdecl
-#else
-#  define GC_cdecl _cdecl
-#endif
-
-#if ! defined( GC_NO_OPERATOR_NEW_ARRAY ) \
-    && !defined(_ENABLE_ARRAYNEW) /* Digimars */ \
-    && (defined(__BORLANDC__) && (__BORLANDC__ < 0x450) \
-	|| (defined(__GNUC__) && \
-	    (__GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 6)) \
-	|| (defined(__WATCOMC__) && __WATCOMC__ < 1050))
-#   define GC_NO_OPERATOR_NEW_ARRAY
-#endif
-
-#if !defined(GC_NO_OPERATOR_NEW_ARRAY) && !defined(GC_OPERATOR_NEW_ARRAY)
-#   define GC_OPERATOR_NEW_ARRAY
-#endif
-
-#if    ! defined ( __BORLANDC__ )  /* Confuses the Borland compiler. */ \
-    && ! defined ( __sgi )
-#  define GC_PLACEMENT_DELETE
-#endif
-
-enum GCPlacement {UseGC,
-#ifndef GC_NAME_CONFLICT
-		  GC=UseGC,
-#endif
-                  NoGC, PointerFreeGC};
-
-class gc {public:
-    inline void* operator new( size_t size );
-    inline void* operator new( size_t size, GCPlacement gcp );
-    inline void* operator new( size_t size, void *p );
-    	/* Must be redefined here, since the other overloadings	*/
-    	/* hide the global definition.				*/
-    inline void operator delete( void* obj );
-#   ifdef GC_PLACEMENT_DELETE  
-      inline void operator delete( void*, void* );
-#   endif
-
-#ifdef GC_OPERATOR_NEW_ARRAY
-    inline void* operator new[]( size_t size );
-    inline void* operator new[]( size_t size, GCPlacement gcp );
-    inline void* operator new[]( size_t size, void *p );
-    inline void operator delete[]( void* obj );
-#   ifdef GC_PLACEMENT_DELETE
-      inline void gc::operator delete[]( void*, void* );
-#   endif
-#endif /* GC_OPERATOR_NEW_ARRAY */
-    };    
-    /*
-    Instances of classes derived from "gc" will be allocated in the 
-    collected heap by default, unless an explicit NoGC placement is
-    specified. */
-
-class gc_cleanup: virtual public gc {public:
-    inline gc_cleanup();
-    inline virtual ~gc_cleanup();
-private:
-    inline static void GC_cdecl cleanup( void* obj, void* clientData );};
-    /*
-    Instances of classes derived from "gc_cleanup" will be allocated
-    in the collected heap by default.  When the collector discovers an
-    inaccessible object derived from "gc_cleanup" or containing a
-    member derived from "gc_cleanup", its destructors will be
-    invoked. */
-
-extern "C" {typedef void (*GCCleanUpFunc)( void* obj, void* clientData );}
-
-#ifdef _MSC_VER
-  // Disable warning that "no matching operator delete found; memory will
-  // not be freed if initialization throws an exception"
-# pragma warning(disable:4291)
-#endif
-
-inline void* operator new( 
-    size_t size, 
-    GCPlacement gcp,
-    GCCleanUpFunc cleanup = 0,
-    void* clientData = 0 );
-    /*
-    Allocates a collectable or uncollected object, according to the
-    value of "gcp".
-
-    For collectable objects, if "cleanup" is non-null, then when the
-    allocated object "obj" becomes inaccessible, the collector will
-    invoke the function "cleanup( obj, clientData )" but will not
-    invoke the object's destructors.  It is an error to explicitly
-    delete an object allocated with a non-null "cleanup".
-
-    It is an error to specify a non-null "cleanup" with NoGC or for
-    classes derived from "gc_cleanup" or containing members derived
-    from "gc_cleanup". */
-
-
-#ifdef _MSC_VER
- /** This ensures that the system default operator new[] doesn't get
-  *  undefined, which is what seems to happen on VC++ 6 for some reason
-  *  if we define a multi-argument operator new[].
-  *  There seems to be really redirect new in this environment without
-  *  including this everywhere. 
-  */
- void *operator new[]( size_t size );
- 
- void operator delete[](void* obj);
-
- void* operator new( size_t size);
-
- void operator delete(void* obj);
-
- // This new operator is used by VC++ in case of Debug builds !
- void* operator new(  size_t size,
-		      int ,//nBlockUse,
-		      const char * szFileName,
-		      int nLine );
-#endif /* _MSC_VER */
-
-
-#ifdef GC_OPERATOR_NEW_ARRAY
-
-inline void* operator new[](
-    size_t size, 
-    GCPlacement gcp,
-    GCCleanUpFunc cleanup = 0,
-    void* clientData = 0 );
-    /*
-    The operator new for arrays, identical to the above. */
-
-#endif /* GC_OPERATOR_NEW_ARRAY */
-
-/****************************************************************************
-
-Inline implementation
-
-****************************************************************************/
-
-inline void* gc::operator new( size_t size ) {
-    return GC_MALLOC( size );}
-    
-inline void* gc::operator new( size_t size, GCPlacement gcp ) {
-    if (gcp == UseGC) 
-        return GC_MALLOC( size );
-    else if (gcp == PointerFreeGC)
-	return GC_MALLOC_ATOMIC( size );
-    else
-        return GC_MALLOC_UNCOLLECTABLE( size );}
-
-inline void* gc::operator new( size_t size, void *p ) {
-    return p;}
-
-inline void gc::operator delete( void* obj ) {
-    GC_FREE( obj );}
-    
-#ifdef GC_PLACEMENT_DELETE
-  inline void gc::operator delete( void*, void* ) {}
-#endif
-
-#ifdef GC_OPERATOR_NEW_ARRAY
-
-inline void* gc::operator new[]( size_t size ) {
-    return gc::operator new( size );}
-    
-inline void* gc::operator new[]( size_t size, GCPlacement gcp ) {
-    return gc::operator new( size, gcp );}
-
-inline void* gc::operator new[]( size_t size, void *p ) {
-    return p;}
-
-inline void gc::operator delete[]( void* obj ) {
-    gc::operator delete( obj );}
-
-#ifdef GC_PLACEMENT_DELETE
-  inline void gc::operator delete[]( void*, void* ) {}
-#endif
-    
-#endif /* GC_OPERATOR_NEW_ARRAY */
-
-
-inline gc_cleanup::~gc_cleanup() {
-    GC_register_finalizer_ignore_self( GC_base(this), 0, 0, 0, 0 );}
-
-inline void gc_cleanup::cleanup( void* obj, void* displ ) {
-    ((gc_cleanup*) ((char*) obj + (ptrdiff_t) displ))->~gc_cleanup();}
-
-inline gc_cleanup::gc_cleanup() {
-    GC_finalization_proc oldProc;
-    void* oldData;
-    void* base = GC_base( (void *) this );
-    if (0 != base)  {
-      // Don't call the debug version, since this is a real base address.
-      GC_register_finalizer_ignore_self( 
-        base, (GC_finalization_proc)cleanup, (void*) ((char*) this - (char*) base), 
-        &oldProc, &oldData );
-      if (0 != oldProc) {
-        GC_register_finalizer_ignore_self( base, oldProc, oldData, 0, 0 );}}}
-
-inline void* operator new( 
-    size_t size, 
-    GCPlacement gcp,
-    GCCleanUpFunc cleanup,
-    void* clientData )
-{
-    void* obj;
-
-    if (gcp == UseGC) {
-        obj = GC_MALLOC( size );
-        if (cleanup != 0) 
-            GC_REGISTER_FINALIZER_IGNORE_SELF( 
-                obj, cleanup, clientData, 0, 0 );}
-    else if (gcp == PointerFreeGC) {
-        obj = GC_MALLOC_ATOMIC( size );}
-    else {
-        obj = GC_MALLOC_UNCOLLECTABLE( size );};
-    return obj;}
-        
-
-#ifdef GC_OPERATOR_NEW_ARRAY
-
-inline void* operator new[]( 
-    size_t size, 
-    GCPlacement gcp,
-    GCCleanUpFunc cleanup,
-    void* clientData )
-{
-    return ::operator new( size, gcp, cleanup, clientData );}
-
-#endif /* GC_OPERATOR_NEW_ARRAY */
-
-
-#endif /* GC_CPP_H */
-
diff --git a/boehm-gc/include/gc_ext_config.h.in b/boehm-gc/include/gc_ext_config.h.in
deleted file mode 100644
index 219ba2fb8c8..00000000000
--- a/boehm-gc/include/gc_ext_config.h.in
+++ /dev/null
@@ -1,7 +0,0 @@
-/* include/gc_ext_config.h.in.  This contains definitions needed by
-external clients that do not want to include the full gc.h.  Currently this
-is used by libjava/include/boehm-gc.h. */
-
-#undef THREAD_LOCAL_ALLOC
-
-#undef HAVE_PTHREAD_GETATTR_NP
diff --git a/boehm-gc/include/gc_gcj.h b/boehm-gc/include/gc_gcj.h
deleted file mode 100644
index 5e79e27b821..00000000000
--- a/boehm-gc/include/gc_gcj.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright 1999 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/* This file assumes the collector has been compiled with GC_GCJ_SUPPORT */
-/* and that an ANSI C compiler is available.				 */
-
-/*
- * We allocate objects whose first word contains a pointer to a struct
- * describing the object type.  This struct contains a garbage collector mark
- * descriptor at offset MARK_DESCR_OFFSET.  Alternatively, the objects
- * may be marked by the mark procedure passed to GC_init_gcj_malloc.
- */
-
-#ifndef GC_GCJ_H
-
-#define GC_GCJ_H
-
-#ifndef MARK_DESCR_OFFSET
-#  define MARK_DESCR_OFFSET	sizeof(word)
-#endif
-	/* Gcj keeps GC descriptor as second word of vtable.	This	*/
-	/* probably needs to be adjusted for other clients.		*/
-	/* We currently assume that this offset is such that:		*/
-	/*	- all objects of this kind are large enough to have	*/
-	/*	  a value at that offset, and				*/
-	/* 	- it is not zero.					*/
-	/* These assumptions allow objects on the free list to be 	*/
-	/* marked normally.						*/
-
-#ifndef _GC_H
-#   include "gc.h"
-#endif
-
-/* The following allocators signal an out of memory condition with	*/
-/* return GC_oom_fn(bytes);						*/
-
-/* The following function must be called before the gcj allocators	*/
-/* can be invoked.							*/
-/* mp_index and mp are the index and mark_proc (see gc_mark.h)		*/
-/* respectively for the allocated objects.  Mark_proc will be 		*/
-/* used to build the descriptor for objects allocated through the	*/
-/* debugging interface.  The mark_proc will be invoked on all such 	*/
-/* objects with an "environment" value of 1.  The client may choose	*/
-/* to use the same mark_proc for some of its generated mark descriptors.*/
-/* In that case, it should use a different "environment" value to	*/
-/* detect the presence or absence of the debug header.			*/
-/* Mp is really of type mark_proc, as defined in gc_mark.h.  We don't 	*/
-/* want to include that here for namespace pollution reasons.		*/
-extern void GC_init_gcj_malloc(int mp_index, void * /* really mark_proc */mp);
-
-/* Allocate an object, clear it, and store the pointer to the	*/
-/* type structure (vtable in gcj).				*/
-/* This adds a byte at the end of the object if GC_malloc would.*/
-extern void * GC_gcj_malloc(size_t lb, void * ptr_to_struct_containing_descr);
-/* The debug versions allocate such that the specified mark_proc	*/
-/* is always invoked.							*/
-extern void * GC_debug_gcj_malloc(size_t lb,
-				  void * ptr_to_struct_containing_descr,
-				  GC_EXTRA_PARAMS);
-
-/* Similar to the above, but the size is in words, and we don't	*/
-/* adjust it.  The size is assumed to be such that it can be 	*/
-/* allocated as a small object.					*/
-/* Unless it is known that the collector is not configured 	*/
-/* with USE_MARK_BYTES and unless it is known that the object	*/
-/* has weak alignment requirements, lw must be even.		*/
-extern void * GC_gcj_fast_malloc(size_t lw,
-				 void * ptr_to_struct_containing_descr);
-extern void * GC_debug_gcj_fast_malloc(size_t lw,
-				 void * ptr_to_struct_containing_descr,
-				 GC_EXTRA_PARAMS);
-
-/* Similar to GC_gcj_malloc, but assumes that a pointer to near the	*/
-/* beginning of the resulting object is always maintained.		*/
-extern void * GC_gcj_malloc_ignore_off_page(size_t lb,
-				void * ptr_to_struct_containing_descr);
-
-/* The kind numbers of normal and debug gcj objects.		*/
-/* Useful only for debug support, we hope.			*/
-extern int GC_gcj_kind;
-
-extern int GC_gcj_debug_kind;
-
-# if defined(GC_LOCAL_ALLOC_H) && defined(GC_REDIRECT_TO_LOCAL)
-    --> gc_local_alloc.h should be included after this.  Otherwise
-    --> we undo the redirection.
-# endif
-
-# ifdef GC_DEBUG
-#   define GC_GCJ_MALLOC(s,d) GC_debug_gcj_malloc(s,d,GC_EXTRAS)
-#   define GC_GCJ_FAST_MALLOC(s,d) GC_debug_gcj_fast_malloc(s,d,GC_EXTRAS)
-#   define GC_GCJ_MALLOC_IGNORE_OFF_PAGE(s,d) GC_debug_gcj_malloc(s,d,GC_EXTRAS)
-# else
-#   define GC_GCJ_MALLOC(s,d) GC_gcj_malloc(s,d)
-#   define GC_GCJ_FAST_MALLOC(s,d) GC_gcj_fast_malloc(s,d)
-#   define GC_GCJ_MALLOC_IGNORE_OFF_PAGE(s,d) \
-	GC_gcj_malloc_ignore_off_page(s,d)
-# endif
-
-#endif /* GC_GCJ_H */
diff --git a/boehm-gc/include/gc_inl.h b/boehm-gc/include/gc_inl.h
deleted file mode 100644
index c535cfd73fc..00000000000
--- a/boehm-gc/include/gc_inl.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, October 3, 1995 2:07 pm PDT */
- 
-# ifndef GC_PRIVATE_H
-#   include "private/gc_priv.h"
-# endif
-
-/* USE OF THIS FILE IS NOT RECOMMENDED unless GC_all_interior_pointers	*/
-/* is always set, or the collector has been built with			*/
-/* -DDONT_ADD_BYTE_AT_END, or the specified size includes a pointerfree	*/
-/* word at the end.  In the standard collector configuration,		*/
-/* the final word of each object may not be scanned.			*/
-/* This iinterface is most useful for compilers that generate C.	*/
-/* Manual use is hereby discouraged.					*/
-
-/* Allocate n words (NOT BYTES).  X is made to point to the result.	*/
-/* It is assumed that n < MAXOBJSZ, and					*/
-/* that n > 0.  On machines requiring double word alignment of some	*/
-/* data, we also assume that n is 1 or even.				*/
-/* If the collector is built with -DUSE_MARK_BYTES or -DPARALLEL_MARK,	*/
-/* the n = 1 case is also disallowed.					*/
-/* Effectively this means that portable code should make sure n is even.*/
-/* This bypasses the							*/
-/* MERGE_SIZES mechanism.  In order to minimize the number of distinct	*/
-/* free lists that are maintained, the caller should ensure that a 	*/
-/* small number of distinct values of n are used.  (The MERGE_SIZES	*/
-/* mechanism normally does this by ensuring that only the leading three	*/
-/* bits of n may be nonzero.  See misc.c for details.)  We really 	*/
-/* recommend this only in cases in which n is a constant, and no	*/
-/* locking is required.							*/
-/* In that case it may allow the compiler to perform substantial	*/
-/* additional optimizations.						*/
-# define GC_MALLOC_WORDS(result,n) \
-{	\
-    register ptr_t op;	\
-    register ptr_t *opp;	\
-    DCL_LOCK_STATE;	\
-	\
-    opp = &(GC_objfreelist[n]);	\
-    FASTLOCK();	\
-    if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {	\
-        FASTUNLOCK();	\
-        (result) = GC_generic_malloc_words_small((n), NORMAL);	\
-    } else { 	\
-        *opp = obj_link(op);	\
-        obj_link(op) = 0;	\
-        GC_words_allocd += (n);	\
-        FASTUNLOCK();	\
-        (result) = (GC_PTR) op;	\
-    }	\
-}
-
-
-/* The same for atomic objects:	*/
-# define GC_MALLOC_ATOMIC_WORDS(result,n) \
-{	\
-    register ptr_t op;	\
-    register ptr_t *opp;	\
-    DCL_LOCK_STATE;	\
-	\
-    opp = &(GC_aobjfreelist[n]);	\
-    FASTLOCK();	\
-    if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {	\
-        FASTUNLOCK();	\
-        (result) = GC_generic_malloc_words_small((n), PTRFREE);	\
-    } else { 	\
-        *opp = obj_link(op);	\
-        obj_link(op) = 0;	\
-        GC_words_allocd += (n);	\
-        FASTUNLOCK();	\
-        (result) = (GC_PTR) op;	\
-    }	\
-}
-
-/* And once more for two word initialized objects: */
-# define GC_CONS(result, first, second) \
-{	\
-    register ptr_t op;	\
-    register ptr_t *opp;	\
-    DCL_LOCK_STATE;	\
-	\
-    opp = &(GC_objfreelist[2]);	\
-    FASTLOCK();	\
-    if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {	\
-        FASTUNLOCK();	\
-        op = GC_generic_malloc_words_small(2, NORMAL);	\
-    } else {	\
-        *opp = obj_link(op);	\
-        GC_words_allocd += 2;	\
-        FASTUNLOCK();	\
-    } \
-    ((word *)op)[0] = (word)(first);	\
-    ((word *)op)[1] = (word)(second);	\
-    (result) = (GC_PTR) op;	\
-}
diff --git a/boehm-gc/include/gc_inline.h b/boehm-gc/include/gc_inline.h
deleted file mode 100644
index db62d1d58a8..00000000000
--- a/boehm-gc/include/gc_inline.h
+++ /dev/null
@@ -1 +0,0 @@
-# include "gc_inl.h"
diff --git a/boehm-gc/include/gc_local_alloc.h b/boehm-gc/include/gc_local_alloc.h
deleted file mode 100644
index 1874c7b6d20..00000000000
--- a/boehm-gc/include/gc_local_alloc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* 
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * Interface for thread local allocation.  Memory obtained
- * this way can be used by all threads, as though it were obtained
- * from an allocator like GC_malloc.  The difference is that GC_local_malloc
- * counts the number of allocations of a given size from the current thread,
- * and uses GC_malloc_many to perform the allocations once a threashold
- * is exceeded.  Thus far less synchronization may be needed.
- * Allocation of known large objects should not use this interface.
- * This interface is designed primarily for fast allocation of small
- * objects on multiprocessors, e.g. for a JVM running on an MP server.
- *
- * If this file is included with GC_GCJ_SUPPORT defined, GCJ-style
- * bitmap allocation primitives will also be included.
- *
- * If this file is included with GC_REDIRECT_TO_LOCAL defined, then
- * GC_MALLOC, GC_MALLOC_ATOMIC, and possibly GC_GCJ_MALLOC will
- * be redefined to use the thread local allocatoor.
- *
- * The interface is available only if the collector is built with
- * -DTHREAD_LOCAL_ALLOC, which is currently supported only on Linux.
- *
- * The debugging allocators use standard, not thread-local allocation.
- *
- * These routines normally require an explicit call to GC_init(), though
- * that may be done from a constructor function.
- */
-
-#ifndef GC_LOCAL_ALLOC_H
-#define GC_LOCAL_ALLOC_H
-
-#ifndef _GC_H
-#   include "gc.h"
-#endif
-
-#if defined(GC_GCJ_SUPPORT) && !defined(GC_GCJ_H)
-#   include "gc_gcj.h"
-#endif
-
-/* We assume ANSI C for this interface.	*/
-
-GC_PTR GC_local_malloc(size_t bytes);
-
-GC_PTR GC_local_malloc_atomic(size_t bytes);
-
-#if defined(GC_GCJ_SUPPORT)
-  GC_PTR GC_local_gcj_malloc(size_t bytes,
-			     void * ptr_to_struct_containing_descr);
-#endif
-
-# ifdef GC_DEBUG
-    /* We don't really use local allocation in this case.	*/
-#   define GC_LOCAL_MALLOC(s) GC_debug_malloc(s,GC_EXTRAS)
-#   define GC_LOCAL_MALLOC_ATOMIC(s) GC_debug_malloc_atomic(s,GC_EXTRAS)
-#   ifdef GC_GCJ_SUPPORT
-#	define GC_LOCAL_GCJ_MALLOC(s,d) GC_debug_gcj_malloc(s,d,GC_EXTRAS)
-#   endif
-# else
-#   define GC_LOCAL_MALLOC(s) GC_local_malloc(s)
-#   define GC_LOCAL_MALLOC_ATOMIC(s) GC_local_malloc_atomic(s)
-#   ifdef GC_GCJ_SUPPORT
-#	define GC_LOCAL_GCJ_MALLOC(s,d) GC_local_gcj_malloc(s,d)
-#   endif
-# endif
-
-# ifdef GC_REDIRECT_TO_LOCAL
-#   undef GC_MALLOC
-#   define GC_MALLOC(s) GC_LOCAL_MALLOC(s)
-#   undef GC_MALLOC_ATOMIC
-#   define GC_MALLOC_ATOMIC(s) GC_LOCAL_MALLOC_ATOMIC(s)
-#   ifdef GC_GCJ_SUPPORT
-#	undef GC_GCJ_MALLOC
-# 	define GC_GCJ_MALLOC(s,d) GC_LOCAL_GCJ_MALLOC(s,d)
-#   endif
-# endif
-
-#endif /* GC_LOCAL_ALLOC_H */
diff --git a/boehm-gc/include/gc_mark.h b/boehm-gc/include/gc_mark.h
deleted file mode 100644
index 953bb74dc08..00000000000
--- a/boehm-gc/include/gc_mark.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 2001 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-/*
- * This contains interfaces to the GC marker that are likely to be useful to
- * clients that provide detailed heap layout information to the collector.
- * This interface should not be used by normal C or C++ clients.
- * It will be useful to runtimes for other languages.
- * 
- * This is an experts-only interface!  There are many ways to break the
- * collector in subtle ways by using this functionality.
- */
-#ifndef GC_MARK_H
-# define GC_MARK_H
-
-# ifndef GC_H
-#   include "gc.h"
-# endif
-
-/* A client supplied mark procedure.  Returns new mark stack pointer.	*/
-/* Primary effect should be to push new entries on the mark stack.	*/
-/* Mark stack pointer values are passed and returned explicitly.	*/
-/* Global variables decribing mark stack are not necessarily valid.	*/
-/* (This usually saves a few cycles by keeping things in registers.)	*/
-/* Assumed to scan about GC_PROC_BYTES on average.  If it needs to do	*/
-/* much more work than that, it should do it in smaller pieces by	*/
-/* pushing itself back on the mark stack.				*/
-/* Note that it should always do some work (defined as marking some	*/
-/* objects) before pushing more than one entry on the mark stack.	*/
-/* This is required to ensure termination in the event of mark stack	*/
-/* overflows.								*/
-/* This procedure is always called with at least one empty entry on the */
-/* mark stack.								*/
-/* Currently we require that mark procedures look for pointers in a	*/
-/* subset of the places the conservative marker would.  It must be safe	*/
-/* to invoke the normal mark procedure instead.				*/
-/* WARNING: Such a mark procedure may be invoked on an unused object    */
-/* residing on a free list.  Such objects are cleared, except for a	*/
-/* free list link field in the first word.  Thus mark procedures may	*/
-/* not count on the presence of a type descriptor, and must handle this	*/
-/* case correctly somehow.						*/
-# define GC_PROC_BYTES 100
-struct GC_ms_entry;
-typedef struct GC_ms_entry * (*GC_mark_proc) GC_PROTO((
-		GC_word * addr, struct GC_ms_entry * mark_stack_ptr,
-		struct GC_ms_entry * mark_stack_limit, GC_word env));
-
-# define GC_LOG_MAX_MARK_PROCS 6
-# define GC_MAX_MARK_PROCS (1 << GC_LOG_MAX_MARK_PROCS)
-
-/* In a few cases it's necessary to assign statically known indices to	*/
-/* certain mark procs.  Thus we reserve a few for well known clients.	*/
-/* (This is necessary if mark descriptors are compiler generated.)	*/
-#define GC_RESERVED_MARK_PROCS 8
-#   define GC_GCJ_RESERVED_MARK_PROC_INDEX 0
-
-/* Object descriptors on mark stack or in objects.  Low order two	*/
-/* bits are tags distinguishing among the following 4 possibilities	*/
-/* for the high order 30 bits.						*/
-#define GC_DS_TAG_BITS 2
-#define GC_DS_TAGS   ((1 << GC_DS_TAG_BITS) - 1)
-#define GC_DS_LENGTH 0	/* The entire word is a length in bytes that	*/
-			/* must be a multiple of 4.			*/
-#define GC_DS_BITMAP 1	/* 30 (62) bits are a bitmap describing pointer	*/
-			/* fields.  The msb is 1 iff the first word	*/
-			/* is a pointer.				*/
-			/* (This unconventional ordering sometimes	*/
-			/* makes the marker slightly faster.)		*/
-			/* Zeroes indicate definite nonpointers.  Ones	*/
-			/* indicate possible pointers.			*/
-			/* Only usable if pointers are word aligned.	*/
-#define GC_DS_PROC   2
-			/* The objects referenced by this object can be */
-			/* pushed on the mark stack by invoking		*/
-			/* PROC(descr).  ENV(descr) is passed as the	*/
-			/* last argument.				*/
-#   define GC_MAKE_PROC(proc_index, env) \
-	    (((((env) << GC_LOG_MAX_MARK_PROCS) \
-	       | (proc_index)) << GC_DS_TAG_BITS) | GC_DS_PROC)
-#define GC_DS_PER_OBJECT 3  /* The real descriptor is at the		*/
-			/* byte displacement from the beginning of the	*/
-			/* object given by descr & ~DS_TAGS		*/
-			/* If the descriptor is negative, the real	*/
-			/* descriptor is at (*<object_start>) -		*/
-			/* (descr & ~DS_TAGS) - GC_INDIR_PER_OBJ_BIAS	*/
-			/* The latter alternative can be used if each	*/
-			/* object contains a type descriptor in the	*/
-			/* first word.					*/
-			/* Note that in multithreaded environments	*/
-			/* per object descriptors maust be located in	*/
-			/* either the first two or last two words of	*/
-			/* the object, since only those are guaranteed	*/
-			/* to be cleared while the allocation lock is	*/
-			/* held.					*/
-#define GC_INDIR_PER_OBJ_BIAS 0x10
-			
-extern GC_PTR GC_least_plausible_heap_addr;
-extern GC_PTR GC_greatest_plausible_heap_addr;
-			/* Bounds on the heap.  Guaranteed valid	*/
-			/* Likely to include future heap expansion.	*/
-
-/* Handle nested references in a custom mark procedure.			*/
-/* Check if obj is a valid object. If so, ensure that it is marked.	*/
-/* If it was not previously marked, push its contents onto the mark 	*/
-/* stack for future scanning.  The object will then be scanned using	*/
-/* its mark descriptor.  						*/
-/* Returns the new mark stack pointer.					*/
-/* Handles mark stack overflows correctly.				*/
-/* Since this marks first, it makes progress even if there are mark	*/
-/* stack overflows.							*/
-/* Src is the address of the pointer to obj, which is used only		*/
-/* for back pointer-based heap debugging.				*/
-/* It is strongly recommended that most objects be handled without mark	*/
-/* procedures, e.g. with bitmap descriptors, and that mark procedures	*/
-/* be reserved for exceptional cases.  That will ensure that 		*/
-/* performance of this call is not extremely performance critical.	*/
-/* (Otherwise we would need to inline GC_mark_and_push completely,	*/
-/* which would tie the client code to a fixed collector version.)	*/
-/* Note that mark procedures should explicitly call FIXUP_POINTER()	*/
-/* if required.								*/
-struct GC_ms_entry *GC_mark_and_push
-		GC_PROTO((GC_PTR obj,
-			  struct GC_ms_entry * mark_stack_ptr,
-		          struct GC_ms_entry * mark_stack_limit, GC_PTR *src));
-
-#define GC_MARK_AND_PUSH(obj, msp, lim, src) \
-	(((GC_word)obj >= (GC_word)GC_least_plausible_heap_addr && \
-	  (GC_word)obj <= (GC_word)GC_greatest_plausible_heap_addr)? \
-	  GC_mark_and_push(obj, msp, lim, src) : \
-	  msp)
-
-extern size_t GC_debug_header_size;
-       /* The size of the header added to objects allocated through    */
-       /* the GC_debug routines.                                       */
-       /* Defined as a variable so that client mark procedures don't   */
-       /* need to be recompiled for collector version changes.         */
-#define GC_USR_PTR_FROM_BASE(p) ((GC_PTR)((char *)(p) + GC_debug_header_size))
-
-/* And some routines to support creation of new "kinds", e.g. with	*/
-/* custom mark procedures, by language runtimes.			*/
-/* The _inner versions assume the caller holds the allocation lock.	*/
-
-/* Return a new free list array.	*/
-void ** GC_new_free_list GC_PROTO((void));
-void ** GC_new_free_list_inner GC_PROTO((void));
-
-/* Return a new kind, as specified. */
-int GC_new_kind GC_PROTO((void **free_list, GC_word mark_descriptor_template,
-		          int add_size_to_descriptor, int clear_new_objects));
-		/* The last two parameters must be zero or one. */
-int GC_new_kind_inner GC_PROTO((void **free_list,
-				GC_word mark_descriptor_template,
-		                int add_size_to_descriptor,
-				int clear_new_objects));
-
-/* Return a new mark procedure identifier, suitable for use as	*/
-/* the first argument in GC_MAKE_PROC.				*/
-int GC_new_proc GC_PROTO((GC_mark_proc));
-int GC_new_proc_inner GC_PROTO((GC_mark_proc));
-
-/* Allocate an object of a given kind.  Note that in multithreaded	*/
-/* contexts, this is usually unsafe for kinds that have the descriptor	*/
-/* in the object itself, since there is otherwise a window in which	*/
-/* the descriptor is not correct.  Even in the single-threaded case,	*/
-/* we need to be sure that cleared objects on a free list don't		*/
-/* cause a GC crash if they are accidentally traced.			*/
-/* ptr_t */char * GC_generic_malloc GC_PROTO((GC_word lb, int k));
-
-/* FIXME - Should return void *, but that requires other changes.	*/
-
-typedef void (*GC_describe_type_fn) GC_PROTO((void *p, char *out_buf));
-				/* A procedure which			*/
-				/* produces a human-readable 		*/
-				/* description of the "type" of object	*/
-				/* p into the buffer out_buf of length	*/
-				/* GC_TYPE_DESCR_LEN.  This is used by	*/
-				/* the debug support when printing 	*/
-				/* objects.				*/ 
-				/* These functions should be as robust	*/
-				/* as possible, though we do avoid 	*/
-				/* invoking them on objects on the 	*/
-				/* global free list.			*/
-#	define GC_TYPE_DESCR_LEN 40
-
-void GC_register_describe_type_fn GC_PROTO((int kind, GC_describe_type_fn knd));
-				/* Register a describe_type function	*/
-				/* to be used when printing objects	*/
-				/* of a particular kind.		*/
-
-#endif  /* GC_MARK_H */
-
diff --git a/boehm-gc/include/gc_pthread_redirects.h b/boehm-gc/include/gc_pthread_redirects.h
deleted file mode 100644
index 842518cfcc4..00000000000
--- a/boehm-gc/include/gc_pthread_redirects.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Our pthread support normally needs to intercept a number of thread	*/
-/* calls.  We arrange to do that here, if appropriate.			*/
-
-#ifndef GC_PTHREAD_REDIRECTS_H
-
-#define GC_PTHREAD_REDIRECTS_H
-
-#if defined(GC_SOLARIS_THREADS)
-/* We need to intercept calls to many of the threads primitives, so 	*/
-/* that we can locate thread stacks and stop the world.			*/
-/* Note also that the collector cannot see thread specific data.	*/
-/* Thread specific data should generally consist of pointers to		*/
-/* uncollectable objects (allocated with GC_malloc_uncollectable,	*/
-/* not the system malloc), which are deallocated using the destructor	*/
-/* facility in thr_keycreate.  Alternatively, keep a redundant pointer	*/
-/* to thread specific data on the thread stack.			        */
-# include <thread.h>
-  int GC_thr_create(void *stack_base, size_t stack_size,
-                    void *(*start_routine)(void *), void *arg, long flags,
-                    thread_t *new_thread);
-  int GC_thr_join(thread_t wait_for, thread_t *departed, void **status);
-  int GC_thr_suspend(thread_t target_thread);
-  int GC_thr_continue(thread_t target_thread);
-  void * GC_dlopen(const char *path, int mode);
-# define thr_create GC_thr_create
-# define thr_join GC_thr_join
-# define thr_suspend GC_thr_suspend
-# define thr_continue GC_thr_continue
-#endif /* GC_SOLARIS_THREADS */
-
-#if defined(GC_SOLARIS_PTHREADS)
-# include <pthread.h>
-# include <signal.h>
-  extern int GC_pthread_create(pthread_t *new_thread,
-    			         const pthread_attr_t *attr,
-          			 void * (*thread_execp)(void *), void *arg);
-  extern int GC_pthread_join(pthread_t wait_for, void **status);
-# define pthread_join GC_pthread_join
-# define pthread_create GC_pthread_create
-#endif
-
-#if defined(GC_SOLARIS_PTHREADS) || defined(GC_SOLARIS_THREADS)
-# define dlopen GC_dlopen
-#endif /* SOLARIS_THREADS || SOLARIS_PTHREADS */
-
-
-#if !defined(GC_USE_LD_WRAP) && defined(GC_PTHREADS) && !defined(GC_SOLARIS_PTHREADS)
-/* We treat these similarly. */
-# include <pthread.h>
-# include <signal.h>
-
-  int GC_pthread_create(pthread_t *new_thread,
-                        const pthread_attr_t *attr,
-		        void *(*start_routine)(void *), void *arg);
-#ifndef GC_DARWIN_THREADS
-  int GC_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset);
-#endif
-  int GC_pthread_join(pthread_t thread, void **retval);
-  int GC_pthread_detach(pthread_t thread);
-
-#if defined(GC_OSF1_THREADS) \
-    && defined(_PTHREAD_USE_MANGLED_NAMES_) && !defined(_PTHREAD_USE_PTDNAM_)
-/* Unless the compiler supports #pragma extern_prefix, the Tru64 UNIX
-   <pthread.h> redefines some POSIX thread functions to use mangled names.
-   If so, undef them before redefining. */
-# undef pthread_create
-# undef pthread_join
-# undef pthread_detach
-#endif
-
-# define pthread_create GC_pthread_create
-# define pthread_join GC_pthread_join
-# define pthread_detach GC_pthread_detach
-
-#ifndef GC_DARWIN_THREADS
-# define pthread_sigmask GC_pthread_sigmask
-# define dlopen GC_dlopen
-#endif
-
-#endif /* GC_xxxxx_THREADS */
-
-#endif /* GC_PTHREAD_REDIRECTS_H */
diff --git a/boehm-gc/include/gc_typed.h b/boehm-gc/include/gc_typed.h
deleted file mode 100644
index 905734b8da0..00000000000
--- a/boehm-gc/include/gc_typed.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright 1996 Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/*
- * Some simple primitives for allocation with explicit type information.
- * Facilities for dynamic type inference may be added later.
- * Should be used only for extremely performance critical applications,
- * or if conservative collector leakage is otherwise a problem (unlikely).
- * Note that this is implemented completely separately from the rest
- * of the collector, and is not linked in unless referenced.
- * This does not currently support GC_DEBUG in any interesting way.
- */
-/* Boehm, May 19, 1994 2:13 pm PDT */
-
-#ifndef _GC_TYPED_H
-# define _GC_TYPED_H
-# ifndef _GC_H
-#   include "gc.h"
-# endif
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-typedef GC_word * GC_bitmap;
-	/* The least significant bit of the first word is one if	*/
-	/* the first word in the object may be a pointer.		*/
-	
-# define GC_WORDSZ (8*sizeof(GC_word))
-# define GC_get_bit(bm, index) \
-		(((bm)[index/GC_WORDSZ] >> (index%GC_WORDSZ)) & 1)
-# define GC_set_bit(bm, index) \
-		(bm)[index/GC_WORDSZ] |= ((GC_word)1 << (index%GC_WORDSZ))
-# define GC_WORD_OFFSET(t, f) (offsetof(t,f)/sizeof(GC_word))
-# define GC_WORD_LEN(t) (sizeof(t)/ sizeof(GC_word))
-# define GC_BITMAP_SIZE(t) ((GC_WORD_LEN(t) + GC_WORDSZ-1)/GC_WORDSZ)
-
-typedef GC_word GC_descr;
-
-GC_API GC_descr GC_make_descriptor GC_PROTO((GC_bitmap bm, size_t len));
-		/* Return a type descriptor for the object whose layout	*/
-		/* is described by the argument.			*/
-		/* The least significant bit of the first word is one	*/
-		/* if the first word in the object may be a pointer.	*/
-		/* The second argument specifies the number of		*/
-		/* meaningful bits in the bitmap.  The actual object 	*/
-		/* may be larger (but not smaller).  Any additional	*/
-		/* words in the object are assumed not to contain 	*/
-		/* pointers.						*/
-		/* Returns a conservative approximation in the		*/
-		/* (unlikely) case of insufficient memory to build	*/
-		/* the descriptor.  Calls to GC_make_descriptor		*/
-		/* may consume some amount of a finite resource.  This	*/
-		/* is intended to be called once per type, not once	*/
-		/* per allocation.					*/
-
-/* It is possible to generate a descriptor for a C type T with	*/
-/* word aligned pointer fields f1, f2, ... as follows:			*/
-/*									*/
-/* GC_descr T_descr;                                                    */
-/* GC_word T_bitmap[GC_BITMAP_SIZE(T)] = {0};				*/
-/* GC_set_bit(T_bitmap, GC_WORD_OFFSET(T,f1));				*/
-/* GC_set_bit(T_bitmap, GC_WORD_OFFSET(T,f2));				*/
-/* ...									*/
-/* T_descr = GC_make_descriptor(T_bitmap, GC_WORD_LEN(T));		*/
-
-GC_API GC_PTR GC_malloc_explicitly_typed
-			GC_PROTO((size_t size_in_bytes, GC_descr d));
-		/* Allocate an object whose layout is described by d.	*/
-		/* The resulting object MAY NOT BE PASSED TO REALLOC.	*/
-		/* The returned object is cleared.			*/
-
-GC_API GC_PTR GC_malloc_explicitly_typed_ignore_off_page
-                        GC_PROTO((size_t size_in_bytes, GC_descr d));
-		
-GC_API GC_PTR GC_calloc_explicitly_typed
-			GC_PROTO((size_t nelements,
-  				  size_t element_size_in_bytes,
-  				  GC_descr d));
-  	/* Allocate an array of nelements elements, each of the	*/
-  	/* given size, and with the given descriptor.		*/
-  	/* The elemnt size must be a multiple of the byte	*/
-  	/* alignment required for pointers.  E.g. on a 32-bit	*/
-  	/* machine with 16-bit aligned pointers, size_in_bytes	*/
-  	/* must be a multiple of 2.				*/
-	/* Returned object is cleared.				*/
-
-#ifdef GC_DEBUG
-#   define GC_MALLOC_EXPLICITLY_TYPED(bytes, d) GC_MALLOC(bytes)
-#   define GC_CALLOC_EXPLICITLY_TYPED(n, bytes, d) GC_MALLOC(n*bytes)
-#else
-#  define GC_MALLOC_EXPLICITLY_TYPED(bytes, d) \
-	GC_malloc_explicitly_typed(bytes, d)
-#  define GC_CALLOC_EXPLICITLY_TYPED(n, bytes, d) \
-	GC_calloc_explicitly_typed(n, bytes, d)
-#endif /* !GC_DEBUG */
-
-#ifdef __cplusplus
-  } /* matches extern "C" */
-#endif
-
-#endif /* _GC_TYPED_H */
-
diff --git a/boehm-gc/include/javaxfc.h b/boehm-gc/include/javaxfc.h
deleted file mode 100644
index 23e01005afe..00000000000
--- a/boehm-gc/include/javaxfc.h
+++ /dev/null
@@ -1,21 +0,0 @@
-# ifndef GC_H
-#   include "gc.h"
-# endif
-
-/*
- * Invoke all remaining finalizers that haven't yet been run.
- * This is needed for strict compliance with the Java standard, 
- * which can make the runtime guarantee that all finalizers are run.
- * This is problematic for several reasons:
- * 1) It means that finalizers, and all methods calle by them,
- *    must be prepared to deal with objects that have been finalized in
- *    spite of the fact that they are still referenced by statically
- *    allocated pointer variables.
- * 1) It may mean that we get stuck in an infinite loop running
- *    finalizers which create new finalizable objects, though that's
- *    probably unlikely.
- * Thus this is not recommended for general use.
- */
-void GC_finalize_all();
-
-
diff --git a/boehm-gc/include/leak_detector.h b/boehm-gc/include/leak_detector.h
deleted file mode 100644
index 0674ab4d09f..00000000000
--- a/boehm-gc/include/leak_detector.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define GC_DEBUG
-#include "gc.h"
-#define malloc(n) GC_MALLOC(n)
-#define calloc(m,n) GC_MALLOC((m)*(n))
-#define free(p) GC_FREE(p)
-#define realloc(p,n) GC_REALLOC((p),(n))
-#define CHECK_LEAKS() GC_gcollect()
diff --git a/boehm-gc/include/new_gc_alloc.h b/boehm-gc/include/new_gc_alloc.h
deleted file mode 100644
index 7546638c981..00000000000
--- a/boehm-gc/include/new_gc_alloc.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-//
-// This is a revision of gc_alloc.h for SGI STL versions > 3.0
-// Unlike earlier versions, it supplements the standard "alloc.h"
-// instead of replacing it.
-//
-// This is sloppy about variable names used in header files.
-// It also doesn't yet understand the new header file names or
-// namespaces.
-//
-// This assumes the collector has been compiled with -DATOMIC_UNCOLLECTABLE.
-// The user should also consider -DREDIRECT_MALLOC=GC_uncollectable_malloc,
-// to ensure that object allocated through malloc are traced.
-//
-// Some of this could be faster in the explicit deallocation case.
-// In particular, we spend too much time clearing objects on the
-// free lists.  That could be avoided.
-//
-// This uses template classes with static members, and hence does not work
-// with g++ 2.7.2 and earlier.
-//
-// Unlike its predecessor, this one simply defines
-// 	gc_alloc
-//	single_client_gc_alloc
-//	traceable_alloc
-//	single_client_traceable_alloc
-//
-// It does not redefine alloc.  Nor does it change the default allocator,
-// though the user may wish to do so.  (The argument against changing
-// the default allocator is that it may introduce subtle link compatibility
-// problems.  The argument for changing it is that the usual default
-// allocator is usually a very bad choice for a garbage collected environment.)
-//
-// This code assumes that the collector itself has been compiled with a
-// compiler that defines __STDC__ .
-//
-
-#ifndef GC_ALLOC_H
-
-#include "gc.h"
-
-#if (__GNUC__ < 3)
-# include <stack>  // A more portable way to get stl_alloc.h .
-#else
-# include <bits/stl_alloc.h>
-# ifndef __STL_BEGIN_NAMESPACE
-# define __STL_BEGIN_NAMESPACE namespace std {
-# define __STL_END_NAMESPACE };
-# endif
-#ifndef __STL_USE_STD_ALLOCATORS
-#define __STL_USE_STD_ALLOCATORS
-#endif
-#endif
-
-/* A hack to deal with gcc 3.1.  If you are using gcc3.1 and later,	*/
-/* you should probably really use gc_allocator.h instead.		*/
-#if defined (__GNUC__) && \
-    (__GNUC > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ >= 1)))
-# define simple_alloc __simple_alloc
-#endif
-
-
-
-#define GC_ALLOC_H
-
-#include <stddef.h>
-#include <string.h>
-
-// The following need to match collector data structures.
-// We can't include gc_priv.h, since that pulls in way too much stuff.
-// This should eventually be factored out into another include file.
-
-extern "C" {
-    extern void ** const GC_objfreelist_ptr;
-    extern void ** const GC_aobjfreelist_ptr;
-    extern void ** const GC_uobjfreelist_ptr;
-    extern void ** const GC_auobjfreelist_ptr;
-
-    extern void GC_incr_words_allocd(size_t words);
-    extern void GC_incr_mem_freed(size_t words);
-
-    extern char * GC_generic_malloc_words_small(size_t word, int kind);
-}
-
-// Object kinds; must match PTRFREE, NORMAL, UNCOLLECTABLE, and
-// AUNCOLLECTABLE in gc_priv.h.
-
-enum { GC_PTRFREE = 0, GC_NORMAL = 1, GC_UNCOLLECTABLE = 2,
-       GC_AUNCOLLECTABLE = 3 };
-
-enum { GC_max_fast_bytes = 255 };
-
-enum { GC_bytes_per_word = sizeof(char *) };
-
-enum { GC_byte_alignment = 8 };
-
-enum { GC_word_alignment = GC_byte_alignment/GC_bytes_per_word };
-
-inline void * &GC_obj_link(void * p)
-{   return *reinterpret_cast<void **>(p);  }
-
-// Compute a number of words >= n+1 bytes.
-// The +1 allows for pointers one past the end.
-inline size_t GC_round_up(size_t n)
-{
-    return ((n + GC_byte_alignment)/GC_byte_alignment)*GC_word_alignment;
-}
-
-// The same but don't allow for extra byte.
-inline size_t GC_round_up_uncollectable(size_t n)
-{
-    return ((n + GC_byte_alignment - 1)/GC_byte_alignment)*GC_word_alignment;
-}
-
-template <int dummy>
-class GC_aux_template {
-public:
-  // File local count of allocated words.  Occasionally this is
-  // added into the global count.  A separate count is necessary since the
-  // real one must be updated with a procedure call.
-  static size_t GC_words_recently_allocd;
-
-  // Same for uncollectable mmory.  Not yet reflected in either
-  // GC_words_recently_allocd or GC_non_gc_bytes.
-  static size_t GC_uncollectable_words_recently_allocd;
-
-  // Similar counter for explicitly deallocated memory.
-  static size_t GC_mem_recently_freed;
-
-  // Again for uncollectable memory.
-  static size_t GC_uncollectable_mem_recently_freed;
-
-  static void * GC_out_of_line_malloc(size_t nwords, int kind);
-};
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_words_recently_allocd = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_uncollectable_words_recently_allocd = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_mem_recently_freed = 0;
-
-template <int dummy>
-size_t GC_aux_template<dummy>::GC_uncollectable_mem_recently_freed = 0;
-
-template <int dummy>
-void * GC_aux_template<dummy>::GC_out_of_line_malloc(size_t nwords, int kind)
-{
-    GC_words_recently_allocd += GC_uncollectable_words_recently_allocd;
-    GC_non_gc_bytes +=
-                GC_bytes_per_word * GC_uncollectable_words_recently_allocd;
-    GC_uncollectable_words_recently_allocd = 0;
-
-    GC_mem_recently_freed += GC_uncollectable_mem_recently_freed;
-    GC_non_gc_bytes -= 
-                GC_bytes_per_word * GC_uncollectable_mem_recently_freed;
-    GC_uncollectable_mem_recently_freed = 0;
-
-    GC_incr_words_allocd(GC_words_recently_allocd);
-    GC_words_recently_allocd = 0;
-
-    GC_incr_mem_freed(GC_mem_recently_freed);
-    GC_mem_recently_freed = 0;
-
-    return GC_generic_malloc_words_small(nwords, kind);
-}
-
-typedef GC_aux_template<0> GC_aux;
-
-// A fast, single-threaded, garbage-collected allocator
-// We assume the first word will be immediately overwritten.
-// In this version, deallocation is not a noop, and explicit
-// deallocation is likely to help performance.
-template <int dummy>
-class single_client_gc_alloc_template {
-    public:
-     	static void * allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc(n);
-	    flh = GC_objfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_NORMAL);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_words_recently_allocd += nwords;
-	    return op;
-        }
-     	static void * ptr_free_allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_atomic(n);
-	    flh = GC_aobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_PTRFREE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_words_recently_allocd += nwords;
-	    return op;
-        }
-	static void deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes)  {
-		GC_free(p);
-	    } else {
-	        flh = GC_objfreelist_ptr + nwords;
-	        GC_obj_link(p) = *flh;
-		memset(reinterpret_cast<char *>(p) + GC_bytes_per_word, 0,
-		       GC_bytes_per_word * (nwords - 1));
-	        *flh = p;
-	        GC_aux::GC_mem_recently_freed += nwords;
-	    }
-	}
-	static void ptr_free_deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes) {
-		GC_free(p);
-	    } else {
-	    	flh = GC_aobjfreelist_ptr + nwords;
-	    	GC_obj_link(p) = *flh;
-	    	*flh = p;
-	    	GC_aux::GC_mem_recently_freed += nwords;
-	    }
-	}
-};
-
-typedef single_client_gc_alloc_template<0> single_client_gc_alloc;
-
-// Once more, for uncollectable objects.
-template <int dummy>
-class single_client_traceable_alloc_template {
-    public:
-     	static void * allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up_uncollectable(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_uncollectable(n);
-	    flh = GC_uobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_UNCOLLECTABLE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_uncollectable_words_recently_allocd += nwords;
-	    return op;
-        }
-     	static void * ptr_free_allocate(size_t n)
-        {
-	    size_t nwords = GC_round_up_uncollectable(n);
-	    void ** flh;
-	    void * op;
-
-  	    if (n > GC_max_fast_bytes) return GC_malloc_atomic_uncollectable(n);
-	    flh = GC_auobjfreelist_ptr + nwords;
-	    if (0 == (op = *flh)) {
-		return GC_aux::GC_out_of_line_malloc(nwords, GC_AUNCOLLECTABLE);
-	    }
-	    *flh = GC_obj_link(op);
-	    GC_aux::GC_uncollectable_words_recently_allocd += nwords;
-	    return op;
-        }
-	static void deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up_uncollectable(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes)  {
-		GC_free(p);
-	    } else {
-	        flh = GC_uobjfreelist_ptr + nwords;
-	        GC_obj_link(p) = *flh;
-	        *flh = p;
-	        GC_aux::GC_uncollectable_mem_recently_freed += nwords;
-	    }
-	}
-	static void ptr_free_deallocate(void *p, size_t n)
-	{
-            size_t nwords = GC_round_up_uncollectable(n);
-            void ** flh;
-	   
-	    if (n > GC_max_fast_bytes) {
-		GC_free(p);
-	    } else {
-	    	flh = GC_auobjfreelist_ptr + nwords;
-	    	GC_obj_link(p) = *flh;
-	    	*flh = p;
-	    	GC_aux::GC_uncollectable_mem_recently_freed += nwords;
-	    }
-	}
-};
-
-typedef single_client_traceable_alloc_template<0> single_client_traceable_alloc;
-
-template < int dummy >
-class gc_alloc_template {
-    public:
-     	static void * allocate(size_t n) { return GC_malloc(n); }
-     	static void * ptr_free_allocate(size_t n)
-		{ return GC_malloc_atomic(n); }
-	static void deallocate(void *, size_t) { }
-	static void ptr_free_deallocate(void *, size_t) { }
-};
-
-typedef gc_alloc_template < 0 > gc_alloc;
-
-template < int dummy >
-class traceable_alloc_template {
-    public:
-     	static void * allocate(size_t n) { return GC_malloc_uncollectable(n); }
-     	static void * ptr_free_allocate(size_t n)
-		{ return GC_malloc_atomic_uncollectable(n); }
-	static void deallocate(void *p, size_t) { GC_free(p); }
-	static void ptr_free_deallocate(void *p, size_t) { GC_free(p); }
-};
-
-typedef traceable_alloc_template < 0 > traceable_alloc;
-
-// We want to specialize simple_alloc so that it does the right thing
-// for all pointerfree types.  At the moment there is no portable way to
-// even approximate that.  The following approximation should work for
-// SGI compilers, and recent versions of g++.
-
-# define __GC_SPECIALIZE(T,alloc) \
-class simple_alloc<T, alloc> { \
-public: \
-    static T *allocate(size_t n) \
-	{ return 0 == n? 0 : \
-			 reinterpret_cast<T*>(alloc::ptr_free_allocate(n * sizeof (T))); } \
-    static T *allocate(void) \
-	{ return reinterpret_cast<T*>(alloc::ptr_free_allocate(sizeof (T))); } \
-    static void deallocate(T *p, size_t n) \
-	{ if (0 != n) alloc::ptr_free_deallocate(p, n * sizeof (T)); } \
-    static void deallocate(T *p) \
-	{ alloc::ptr_free_deallocate(p, sizeof (T)); } \
-};
-
-__STL_BEGIN_NAMESPACE
-
-__GC_SPECIALIZE(char, gc_alloc)
-__GC_SPECIALIZE(int, gc_alloc)
-__GC_SPECIALIZE(unsigned, gc_alloc)
-__GC_SPECIALIZE(float, gc_alloc)
-__GC_SPECIALIZE(double, gc_alloc)
-
-__GC_SPECIALIZE(char, traceable_alloc)
-__GC_SPECIALIZE(int, traceable_alloc)
-__GC_SPECIALIZE(unsigned, traceable_alloc)
-__GC_SPECIALIZE(float, traceable_alloc)
-__GC_SPECIALIZE(double, traceable_alloc)
-
-__GC_SPECIALIZE(char, single_client_gc_alloc)
-__GC_SPECIALIZE(int, single_client_gc_alloc)
-__GC_SPECIALIZE(unsigned, single_client_gc_alloc)
-__GC_SPECIALIZE(float, single_client_gc_alloc)
-__GC_SPECIALIZE(double, single_client_gc_alloc)
-
-__GC_SPECIALIZE(char, single_client_traceable_alloc)
-__GC_SPECIALIZE(int, single_client_traceable_alloc)
-__GC_SPECIALIZE(unsigned, single_client_traceable_alloc)
-__GC_SPECIALIZE(float, single_client_traceable_alloc)
-__GC_SPECIALIZE(double, single_client_traceable_alloc)
-
-__STL_END_NAMESPACE
-
-#ifdef __STL_USE_STD_ALLOCATORS
-
-__STL_BEGIN_NAMESPACE
-
-template <class _Tp>
-struct _Alloc_traits<_Tp, gc_alloc >
-{
-  static const bool _S_instanceless = true;
-  typedef simple_alloc<_Tp, gc_alloc > _Alloc_type;
-  typedef __allocator<_Tp, gc_alloc > allocator_type;
-};
-
-inline bool operator==(const gc_alloc&,
-                       const gc_alloc&)
-{
-  return true;
-}
-
-inline bool operator!=(const gc_alloc&,
-                       const gc_alloc&)
-{
-  return false;
-}
-
-template <class _Tp>
-struct _Alloc_traits<_Tp, single_client_gc_alloc >
-{
-  static const bool _S_instanceless = true;
-  typedef simple_alloc<_Tp, single_client_gc_alloc > _Alloc_type;
-  typedef __allocator<_Tp, single_client_gc_alloc > allocator_type;
-};
-
-inline bool operator==(const single_client_gc_alloc&,
-                       const single_client_gc_alloc&)
-{
-  return true;
-}
-
-inline bool operator!=(const single_client_gc_alloc&,
-                       const single_client_gc_alloc&)
-{
-  return false;
-}
-
-template <class _Tp>
-struct _Alloc_traits<_Tp, traceable_alloc >
-{
-  static const bool _S_instanceless = true;
-  typedef simple_alloc<_Tp, traceable_alloc > _Alloc_type;
-  typedef __allocator<_Tp, traceable_alloc > allocator_type;
-};
-
-inline bool operator==(const traceable_alloc&,
-                       const traceable_alloc&)
-{
-  return true;
-}
-
-inline bool operator!=(const traceable_alloc&,
-                       const traceable_alloc&)
-{
-  return false;
-}
-
-template <class _Tp>
-struct _Alloc_traits<_Tp, single_client_traceable_alloc >
-{
-  static const bool _S_instanceless = true;
-  typedef simple_alloc<_Tp, single_client_traceable_alloc > _Alloc_type;
-  typedef __allocator<_Tp, single_client_traceable_alloc > allocator_type;
-};
-
-inline bool operator==(const single_client_traceable_alloc&,
-                       const single_client_traceable_alloc&)
-{
-  return true;
-}
-
-inline bool operator!=(const single_client_traceable_alloc&,
-                       const single_client_traceable_alloc&)
-{
-  return false;
-}
-
-__STL_END_NAMESPACE
-
-#endif /* __STL_USE_STD_ALLOCATORS */
-
-#endif /* GC_ALLOC_H */
diff --git a/boehm-gc/include/private/cord_pos.h b/boehm-gc/include/private/cord_pos.h
deleted file mode 100644
index d2b24bb8ab6..00000000000
--- a/boehm-gc/include/private/cord_pos.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* 
- * Copyright (c) 1993-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, May 19, 1994 2:23 pm PDT */
-# ifndef CORD_POSITION_H
-
-/* The representation of CORD_position.  This is private to the	*/
-/* implementation, but the size is known to clients.  Also	*/
-/* the implementation of some exported macros relies on it.	*/
-/* Don't use anything defined here and not in cord.h.		*/
-
-# define MAX_DEPTH 48
-	/* The maximum depth of a balanced cord + 1.		*/
-	/* We don't let cords get deeper than MAX_DEPTH.	*/
-
-struct CORD_pe {
-    CORD pe_cord;
-    size_t pe_start_pos;
-};
-
-/* A structure describing an entry on the path from the root 	*/
-/* to current position.						*/
-typedef struct CORD_Pos {
-    size_t cur_pos;
-    int path_len;
-#	define CORD_POS_INVALID (0x55555555)
-		/* path_len == INVALID <==> position invalid */
-    const char *cur_leaf;	/* Current leaf, if it is a string.	*/
-    				/* If the current leaf is a function,	*/
-    				/* then this may point to function_buf	*/
-    				/* containing the next few characters.	*/
-    				/* Always points to a valid string	*/
-    				/* containing the current character 	*/
-    				/* unless cur_end is 0.			*/
-    size_t cur_start;	/* Start position of cur_leaf	*/
-    size_t cur_end;	/* Ending position of cur_leaf	*/
-    			/* 0 if cur_leaf is invalid.	*/
-    struct CORD_pe path[MAX_DEPTH + 1];
-    	/* path[path_len] is the leaf corresponding to cur_pos	*/
-    	/* path[0].pe_cord is the cord we point to.		*/
-#   define FUNCTION_BUF_SZ 8
-    char function_buf[FUNCTION_BUF_SZ];	/* Space for next few chars	*/
-    					/* from function node.		*/
-} CORD_pos[1];
-
-/* Extract the cord from a position:	*/
-CORD CORD_pos_to_cord(CORD_pos p);
-	
-/* Extract the current index from a position:	*/
-size_t CORD_pos_to_index(CORD_pos p);
-	
-/* Fetch the character located at the given position:	*/
-char CORD_pos_fetch(CORD_pos p);
-	
-/* Initialize the position to refer to the give cord and index.	*/
-/* Note that this is the most expensive function on positions:	*/
-void CORD_set_pos(CORD_pos p, CORD x, size_t i);
-	
-/* Advance the position to the next character.	*/
-/* P must be initialized and valid.		*/
-/* Invalidates p if past end:			*/
-void CORD_next(CORD_pos p);
-
-/* Move the position to the preceding character.	*/
-/* P must be initialized and valid.			*/
-/* Invalidates p if past beginning:			*/
-void CORD_prev(CORD_pos p);
-	
-/* Is the position valid, i.e. inside the cord?		*/
-int CORD_pos_valid(CORD_pos p);
-
-char CORD__pos_fetch(CORD_pos);
-void CORD__next(CORD_pos);
-void CORD__prev(CORD_pos);
-
-#define CORD_pos_fetch(p)	\
-    (((p)[0].cur_end != 0)? \
-     	(p)[0].cur_leaf[(p)[0].cur_pos - (p)[0].cur_start] \
-     	: CORD__pos_fetch(p))
-
-#define CORD_next(p)	\
-    (((p)[0].cur_pos + 1 < (p)[0].cur_end)? \
-    	(p)[0].cur_pos++ \
-    	: (CORD__next(p), 0))
-
-#define CORD_prev(p)	\
-    (((p)[0].cur_end != 0 && (p)[0].cur_pos > (p)[0].cur_start)? \
-    	(p)[0].cur_pos-- \
-    	: (CORD__prev(p), 0))
-
-#define CORD_pos_to_index(p) ((p)[0].cur_pos)
-
-#define CORD_pos_to_cord(p) ((p)[0].path[0].pe_cord)
-
-#define CORD_pos_valid(p) ((p)[0].path_len != CORD_POS_INVALID)
-
-/* Some grubby stuff for performance-critical friends:	*/
-#define CORD_pos_chars_left(p) ((long)((p)[0].cur_end) - (long)((p)[0].cur_pos))
-	/* Number of characters in cache.  <= 0 ==> none	*/
-
-#define CORD_pos_advance(p,n) ((p)[0].cur_pos += (n) - 1, CORD_next(p))
-	/* Advance position by n characters	*/
-	/* 0 < n < CORD_pos_chars_left(p)	*/
-
-#define CORD_pos_cur_char_addr(p) \
-	(p)[0].cur_leaf + ((p)[0].cur_pos - (p)[0].cur_start)
-	/* address of current character in cache.	*/
-
-#endif
diff --git a/boehm-gc/include/private/darwin_semaphore.h b/boehm-gc/include/private/darwin_semaphore.h
deleted file mode 100644
index 0f43982d5c1..00000000000
--- a/boehm-gc/include/private/darwin_semaphore.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef GC_DARWIN_SEMAPHORE_H
-#define GC_DARWIN_SEMAPHORE_H
-
-#if !defined(GC_DARWIN_THREADS)
-#error darwin_semaphore.h included with GC_DARWIN_THREADS not defined
-#endif
-
-/*
-   This is a very simple semaphore implementation for darwin. It
-   is implemented in terms of pthreads calls so it isn't async signal
-   safe. This isn't a problem because signals aren't used to
-   suspend threads on darwin.
-*/
-   
-typedef struct {
-    pthread_mutex_t mutex;
-    pthread_cond_t cond;
-    int value;
-} sem_t;
-
-static int sem_init(sem_t *sem, int pshared, int value) {
-    int ret;
-    if(pshared)
-        GC_abort("sem_init with pshared set");
-    sem->value = value;
-    
-    ret = pthread_mutex_init(&sem->mutex,NULL);
-    if(ret < 0) return -1;
-    ret = pthread_cond_init(&sem->cond,NULL);
-    if(ret < 0) return -1;
-    return 0;
-}
-
-static int sem_post(sem_t *sem) {
-    if(pthread_mutex_lock(&sem->mutex) < 0)
-        return -1;
-    sem->value++;
-    if(pthread_cond_signal(&sem->cond) < 0) {
-        pthread_mutex_unlock(&sem->mutex);
-        return -1;
-    }
-    if(pthread_mutex_unlock(&sem->mutex) < 0)
-        return -1;
-    return 0;
-}
-
-static int sem_wait(sem_t *sem) {
-    if(pthread_mutex_lock(&sem->mutex) < 0)
-        return -1;
-    while(sem->value == 0) {
-        pthread_cond_wait(&sem->cond,&sem->mutex);
-    }
-    sem->value--;
-    if(pthread_mutex_unlock(&sem->mutex) < 0)
-        return -1;    
-    return 0;
-}
-
-static int sem_destroy(sem_t *sem) {
-    int ret;
-    ret = pthread_cond_destroy(&sem->cond);
-    if(ret < 0) return -1;
-    ret = pthread_mutex_destroy(&sem->mutex);
-    if(ret < 0) return -1;
-    return 0;
-}
-
-#endif
diff --git a/boehm-gc/include/private/darwin_stop_world.h b/boehm-gc/include/private/darwin_stop_world.h
deleted file mode 100644
index f6f5314ee31..00000000000
--- a/boehm-gc/include/private/darwin_stop_world.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef GC_DARWIN_STOP_WORLD_H
-#define GC_DARWIN_STOP_WORLD_H
-
-#if !defined(GC_DARWIN_THREADS)
-#error darwin_stop_world.h included without GC_DARWIN_THREADS defined
-#endif
-
-#include <mach/mach.h>
-#include <mach/thread_act.h>
-
-struct thread_stop_info {
-    mach_port_t mach_thread;
-};
-
-struct GC_mach_thread {
-  thread_act_t thread;
-  int already_suspended;
-};
-
-void GC_darwin_register_mach_handler_thread(mach_port_t thread);
-
-#endif
diff --git a/boehm-gc/include/private/dbg_mlc.h b/boehm-gc/include/private/dbg_mlc.h
deleted file mode 100644
index e0a994de5e2..00000000000
--- a/boehm-gc/include/private/dbg_mlc.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1997 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * This is mostly an internal header file.  Typical clients should
- * not use it.  Clients that define their own object kinds with
- * debugging allocators will probably want to include this, however.
- * No attempt is made to keep the namespace clean.  This should not be
- * included from header files that are frequently included by clients.
- */
-
-#ifndef _DBG_MLC_H
-
-#define _DBG_MLC_H
-
-# define I_HIDE_POINTERS
-# include "gc_priv.h"
-# ifdef KEEP_BACK_PTRS
-#   include "gc_backptr.h"
-# endif
-
-#ifndef HIDE_POINTER
-  /* Gc.h was previously included, and hence the I_HIDE_POINTERS	*/
-  /* definition had no effect.  Repeat the gc.h definitions here to	*/
-  /* get them anyway.							*/
-    typedef GC_word GC_hidden_pointer;
-#   define HIDE_POINTER(p) (~(GC_hidden_pointer)(p))
-#   define REVEAL_POINTER(p) ((GC_PTR)(HIDE_POINTER(p)))
-#endif /* HIDE_POINTER */
-
-# define START_FLAG ((word)0xfedcedcb)
-# define END_FLAG ((word)0xbcdecdef)
-	/* Stored both one past the end of user object, and one before	*/
-	/* the end of the object as seen by the allocator.		*/
-
-# if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST) \
-     || defined(MAKE_BACK_GRAPH)
-    /* Pointer "source"s that aren't real locations.	*/
-    /* Used in oh_back_ptr fields and as "source"	*/
-    /* argument to some marking functions.		*/
-#	define NOT_MARKED (ptr_t)(0)
-#	define MARKED_FOR_FINALIZATION (ptr_t)(2)
-	    /* Object was marked because it is finalizable.	*/
-#	define MARKED_FROM_REGISTER (ptr_t)(4)
-	    /* Object was marked from a rgister.  Hence the	*/
-	    /* source of the reference doesn't have an address.	*/
-# endif /* KEEP_BACK_PTRS || PRINT_BLACK_LIST */
-
-/* Object header */
-typedef struct {
-#   if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
-	/* We potentially keep two different kinds of back 	*/
-	/* pointers.  KEEP_BACK_PTRS stores a single back 	*/
-	/* pointer in each reachable object to allow reporting	*/
-	/* of why an object was retained.  MAKE_BACK_GRAPH	*/
-	/* builds a graph containing the inverse of all 	*/
-	/* "points-to" edges including those involving 		*/
-	/* objects that have just become unreachable. This	*/
-	/* allows detection of growing chains of unreachable	*/
-	/* objects.  It may be possible to eventually combine	*/
-	/* both, but for now we keep them separate.  Both	*/
-	/* kinds of back pointers are hidden using the 		*/
-	/* following macros.  In both cases, the plain version	*/
-	/* is constrained to have an least significant bit of 1,*/
-	/* to allow it to be distinguished from a free list 	*/
-	/* link.  This means the plain version must have an	*/
-	/* lsb of 0.						*/
-	/* Note that blocks dropped by black-listing will	*/
-	/* also have the lsb clear once debugging has		*/
-	/* started.						*/
-	/* We're careful never to overwrite a value with lsb 0.	*/
-#       if ALIGNMENT == 1
-	  /* Fudge back pointer to be even.  */
-#	  define HIDE_BACK_PTR(p) HIDE_POINTER(~1 & (GC_word)(p))
-#	else
-#	  define HIDE_BACK_PTR(p) HIDE_POINTER(p)
-#	endif
-	
-#       ifdef KEEP_BACK_PTRS
-	  GC_hidden_pointer oh_back_ptr;
-#	endif
-#	ifdef MAKE_BACK_GRAPH
-	  GC_hidden_pointer oh_bg_ptr;
-#	endif
-#	if defined(ALIGN_DOUBLE) && \
-	    (defined(KEEP_BACK_PTRS) != defined(MAKE_BACK_GRAPH))
-	  word oh_dummy;
-#	endif
-#   endif
-    GC_CONST char * oh_string;	/* object descriptor string	*/
-    word oh_int;		/* object descriptor integers	*/
-#   ifdef NEED_CALLINFO
-      struct callinfo oh_ci[NFRAMES];
-#   endif
-#   ifndef SHORT_DBG_HDRS
-      word oh_sz;			/* Original malloc arg.		*/
-      word oh_sf;			/* start flag */
-#   endif /* SHORT_DBG_HDRS */
-} oh;
-/* The size of the above structure is assumed not to dealign things,	*/
-/* and to be a multiple of the word length.				*/
-
-#ifdef SHORT_DBG_HDRS
-#   define DEBUG_BYTES (sizeof (oh))
-#   define UNCOLLECTABLE_DEBUG_BYTES DEBUG_BYTES
-#else
-    /* Add space for END_FLAG, but use any extra space that was already	*/
-    /* added to catch off-the-end pointers.				*/
-    /* For uncollectable objects, the extra byte is not added.		*/
-#   define UNCOLLECTABLE_DEBUG_BYTES (sizeof (oh) + sizeof (word))
-#   define DEBUG_BYTES (UNCOLLECTABLE_DEBUG_BYTES - EXTRA_BYTES)
-#endif
-
-/* Round bytes to words without adding extra byte at end.	*/
-#define SIMPLE_ROUNDED_UP_WORDS(n) BYTES_TO_WORDS((n) + WORDS_TO_BYTES(1) - 1)
-
-/* ADD_CALL_CHAIN stores a (partial) call chain into an object	*/
-/* header.  It may be called with or without the allocation 	*/
-/* lock.							*/
-/* PRINT_CALL_CHAIN prints the call chain stored in an object	*/
-/* to stderr.  It requires that we do not hold the lock.	*/
-#ifdef SAVE_CALL_CHAIN
-#   define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)
-#   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
-#else
-# ifdef GC_ADD_CALLER
-#   define ADD_CALL_CHAIN(base, ra) ((oh *)(base)) -> oh_ci[0].ci_pc = (ra)
-#   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
-# else
-#   define ADD_CALL_CHAIN(base, ra)
-#   define PRINT_CALL_CHAIN(base)
-# endif
-#endif
-
-# ifdef GC_ADD_CALLER
-#   define OPT_RA ra,
-# else
-#   define OPT_RA
-# endif
-
-
-/* Check whether object with base pointer p has debugging info	*/ 
-/* p is assumed to point to a legitimate object in our part	*/
-/* of the heap.							*/
-#ifdef SHORT_DBG_HDRS
-# define GC_has_other_debug_info(p) TRUE
-#else
-  GC_bool GC_has_other_debug_info(/* p */);
-#endif
-
-#if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
-# define GC_HAS_DEBUG_INFO(p) \
-	((*((word *)p) & 1) && GC_has_other_debug_info(p))
-#else
-# define GC_HAS_DEBUG_INFO(p) GC_has_other_debug_info(p)
-#endif
-
-/* Store debugging info into p.  Return displaced pointer. */
-/* Assumes we don't hold allocation lock.		   */
-ptr_t GC_store_debug_info(/* p, sz, string, integer */);
-
-#endif /* _DBG_MLC_H */
diff --git a/boehm-gc/include/private/gc_hdrs.h b/boehm-gc/include/private/gc_hdrs.h
deleted file mode 100644
index 70dfefe8fa7..00000000000
--- a/boehm-gc/include/private/gc_hdrs.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, July 11, 1995 11:54 am PDT */
-# ifndef GC_HEADERS_H
-# define GC_HEADERS_H
-typedef struct hblkhdr hdr;
-
-# if CPP_WORDSZ != 32 && CPP_WORDSZ < 36
-	--> Get a real machine.
-# endif
-
-/*
- * The 2 level tree data structure that is used to find block headers.
- * If there are more than 32 bits in a pointer, the top level is a hash
- * table.
- *
- * This defines HDR, GET_HDR, and SET_HDR, the main macros used to
- * retrieve and set object headers.
- *
- * Since 5.0 alpha 5, we can also take advantage of a header lookup
- * cache.  This is a locally declared direct mapped cache, used inside
- * the marker.  The HC_GET_HDR macro uses and maintains this
- * cache.  Assuming we get reasonable hit rates, this shaves a few
- * memory references from each pointer validation.
- */
-
-# if CPP_WORDSZ > 32
-#   define HASH_TL
-# endif
-
-/* Define appropriate out-degrees for each of the two tree levels	*/
-# ifdef SMALL_CONFIG
-#   define LOG_BOTTOM_SZ 11
-	/* Keep top index size reasonable with smaller blocks. */
-# else
-#   define LOG_BOTTOM_SZ 10
-# endif
-# ifndef HASH_TL
-#   define LOG_TOP_SZ (WORDSZ - LOG_BOTTOM_SZ - LOG_HBLKSIZE)
-# else
-#   define LOG_TOP_SZ 11
-# endif
-# define TOP_SZ (1 << LOG_TOP_SZ)
-# define BOTTOM_SZ (1 << LOG_BOTTOM_SZ)
-
-#ifndef SMALL_CONFIG
-# define USE_HDR_CACHE
-#endif
-
-/* #define COUNT_HDR_CACHE_HITS  */
-
-extern hdr * GC_invalid_header; /* header for an imaginary block 	*/
-				/* containing no objects.		*/
-
-
-/* Check whether p and corresponding hhdr point to long or invalid	*/
-/* object.  If so, advance hhdr	to					*/
-/* beginning of	block, or set hhdr to GC_invalid_header.		*/
-#define ADVANCE(p, hhdr, source) \
-	    { \
-	      hdr * new_hdr = GC_invalid_header; \
-              p = GC_find_start(p, hhdr, &new_hdr); \
-	      hhdr = new_hdr; \
-    	    }
-
-#ifdef USE_HDR_CACHE
-
-# ifdef COUNT_HDR_CACHE_HITS
-    extern word GC_hdr_cache_hits;
-    extern word GC_hdr_cache_misses;
-#   define HC_HIT() ++GC_hdr_cache_hits
-#   define HC_MISS() ++GC_hdr_cache_misses
-# else
-#   define HC_HIT()
-#   define HC_MISS()
-# endif
-
-  typedef struct hce {
-    word block_addr;  	/* right shifted by LOG_HBLKSIZE */
-    hdr * hce_hdr;
-  } hdr_cache_entry;
-
-# define HDR_CACHE_SIZE 8  /* power of 2 */
-
-# define DECLARE_HDR_CACHE \
-	hdr_cache_entry hdr_cache[HDR_CACHE_SIZE]
-
-# define INIT_HDR_CACHE BZERO(hdr_cache, sizeof(hdr_cache));
-
-# define HCE(h) hdr_cache + (((word)(h) >> LOG_HBLKSIZE) & (HDR_CACHE_SIZE-1))
-
-# define HCE_VALID_FOR(hce,h) ((hce) -> block_addr == \
-				((word)(h) >> LOG_HBLKSIZE))
-
-# define HCE_HDR(h) ((hce) -> hce_hdr)
-
-
-/* Analogous to GET_HDR, except that in the case of large objects, it	*/
-/* Returns the header for the object beginning, and updates p.		*/
-/* Returns GC_invalid_header instead of 0.  All of this saves a branch	*/
-/* in the fast path.							*/
-# define HC_GET_HDR(p, hhdr, source) \
-	{ \
-	  hdr_cache_entry * hce = HCE(p); \
-	  if (HCE_VALID_FOR(hce, p)) { \
-	    HC_HIT(); \
-	    hhdr = hce -> hce_hdr; \
-	  } else { \
-	    HC_MISS(); \
-	    GET_HDR(p, hhdr); \
-            if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) { \
-	      ADVANCE(p, hhdr, source); \
-	    } else { \
-	      hce -> block_addr = (word)(p) >> LOG_HBLKSIZE; \
-	      hce -> hce_hdr = hhdr; \
-	    } \
-	  } \
-	}
-
-#else /* !USE_HDR_CACHE */
-
-# define DECLARE_HDR_CACHE
-
-# define INIT_HDR_CACHE
-
-# define HC_GET_HDR(p, hhdr, source) \
-	{ \
-	  GET_HDR(p, hhdr); \
-          if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) { \
-	    ADVANCE(p, hhdr, source); \
-	  } \
-	}
-#endif
-
-typedef struct bi {
-    hdr * index[BOTTOM_SZ];
-	/*
- 	 * The bottom level index contains one of three kinds of values:
-	 * 0 means we're not responsible for this block,
-	 *   or this is a block other than the first one in a free block.
-	 * 1 < (long)X <= MAX_JUMP means the block starts at least
-	 *        X * HBLKSIZE bytes before the current address.
-	 * A valid pointer points to a hdr structure. (The above can't be
-	 * valid pointers due to the GET_MEM return convention.)
-	 */
-    struct bi * asc_link;	/* All indices are linked in	*/
-    				/* ascending order...		*/
-    struct bi * desc_link;	/* ... and in descending order.	*/
-    word key;			/* high order address bits.	*/
-# ifdef HASH_TL
-    struct bi * hash_link;	/* Hash chain link.		*/
-# endif
-} bottom_index;
-
-/* extern bottom_index GC_all_nils; - really part of GC_arrays */
-
-/* extern bottom_index * GC_top_index []; - really part of GC_arrays */
-				/* Each entry points to a bottom_index.	*/
-				/* On a 32 bit machine, it points to 	*/
-				/* the index for a set of high order	*/
-				/* bits equal to the index.  For longer	*/
-				/* addresses, we hash the high order	*/
-				/* bits to compute the index in 	*/
-				/* GC_top_index, and each entry points	*/
-				/* to a hash chain.			*/
-				/* The last entry in each chain is	*/
-				/* GC_all_nils.				*/
-
-
-# define MAX_JUMP (HBLKSIZE - 1)
-
-# define HDR_FROM_BI(bi, p) \
-		((bi)->index[((word)(p) >> LOG_HBLKSIZE) & (BOTTOM_SZ - 1)])
-# ifndef HASH_TL
-#   define BI(p) (GC_top_index \
-		[(word)(p) >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE)])
-#   define HDR_INNER(p) HDR_FROM_BI(BI(p),p)
-#   ifdef SMALL_CONFIG
-#	define HDR(p) GC_find_header((ptr_t)(p))
-#   else
-#	define HDR(p) HDR_INNER(p)
-#   endif
-#   define GET_BI(p, bottom_indx) (bottom_indx) = BI(p)
-#   define GET_HDR(p, hhdr) (hhdr) = HDR(p)
-#   define SET_HDR(p, hhdr) HDR_INNER(p) = (hhdr)
-#   define GET_HDR_ADDR(p, ha) (ha) = &(HDR_INNER(p))
-# else /* hash */
-/*  Hash function for tree top level */
-#   define TL_HASH(hi) ((hi) & (TOP_SZ - 1))
-/*  Set bottom_indx to point to the bottom index for address p */
-#   define GET_BI(p, bottom_indx) \
-	{ \
-	    register word hi = \
-	        (word)(p) >> (LOG_BOTTOM_SZ + LOG_HBLKSIZE); \
-	    register bottom_index * _bi = GC_top_index[TL_HASH(hi)]; \
-	    \
-	    while (_bi -> key != hi && _bi != GC_all_nils) \
-	    	_bi = _bi -> hash_link; \
-	    (bottom_indx) = _bi; \
-	}
-#   define GET_HDR_ADDR(p, ha) \
-	{ \
-	    register bottom_index * bi; \
-	    \
-	    GET_BI(p, bi);	\
-	    (ha) = &(HDR_FROM_BI(bi, p)); \
-	}
-#   define GET_HDR(p, hhdr) { register hdr ** _ha; GET_HDR_ADDR(p, _ha); \
-			      (hhdr) = *_ha; }
-#   define SET_HDR(p, hhdr) { register hdr ** _ha; GET_HDR_ADDR(p, _ha); \
-			      *_ha = (hhdr); }
-#   define HDR(p) GC_find_header((ptr_t)(p))
-# endif
-			    
-/* Is the result a forwarding address to someplace closer to the	*/
-/* beginning of the block or NIL?					*/
-# define IS_FORWARDING_ADDR_OR_NIL(hhdr) ((unsigned long) (hhdr) <= MAX_JUMP)
-
-/* Get an HBLKSIZE aligned address closer to the beginning of the block */
-/* h.  Assumes hhdr == HDR(h) and IS_FORWARDING_ADDR(hhdr).		*/
-# define FORWARDED_ADDR(h, hhdr) ((struct hblk *)(h) - (unsigned long)(hhdr))
-# endif /*  GC_HEADERS_H */
diff --git a/boehm-gc/include/private/gc_locks.h b/boehm-gc/include/private/gc_locks.h
deleted file mode 100644
index 54cfdb92d37..00000000000
--- a/boehm-gc/include/private/gc_locks.h
+++ /dev/null
@@ -1,684 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
- *
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#ifndef GC_LOCKS_H
-#define GC_LOCKS_H
-
-/*
- * Mutual exclusion between allocator/collector routines.
- * Needed if there is more than one allocator thread.
- * FASTLOCK() is assumed to try to acquire the lock in a cheap and
- * dirty way that is acceptable for a few instructions, e.g. by
- * inhibiting preemption.  This is assumed to have succeeded only
- * if a subsequent call to FASTLOCK_SUCCEEDED() returns TRUE.
- * FASTUNLOCK() is called whether or not FASTLOCK_SUCCEEDED().
- * If signals cannot be tolerated with the FASTLOCK held, then
- * FASTLOCK should disable signals.  The code executed under
- * FASTLOCK is otherwise immune to interruption, provided it is
- * not restarted.
- * DCL_LOCK_STATE declares any local variables needed by LOCK and UNLOCK
- * and/or DISABLE_SIGNALS and ENABLE_SIGNALS and/or FASTLOCK.
- * (There is currently no equivalent for FASTLOCK.)
- *
- * In the PARALLEL_MARK case, we also need to define a number of
- * other inline finctions here:
- *   GC_bool GC_compare_and_exchange( volatile GC_word *addr,
- *   				      GC_word old, GC_word new )
- *   GC_word GC_atomic_add( volatile GC_word *addr, GC_word how_much )
- *   void GC_memory_barrier( )
- *   
- */  
-# ifdef THREADS
-   void GC_noop1 GC_PROTO((word));
-#  ifdef PCR_OBSOLETE	/* Faster, but broken with multiple lwp's	*/
-#    include  "th/PCR_Th.h"
-#    include  "th/PCR_ThCrSec.h"
-     extern struct PCR_Th_MLRep GC_allocate_ml;
-#    define DCL_LOCK_STATE  PCR_sigset_t GC_old_sig_mask
-#    define LOCK() PCR_Th_ML_Acquire(&GC_allocate_ml) 
-#    define UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
-#    define UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
-#    define FASTLOCK() PCR_ThCrSec_EnterSys()
-     /* Here we cheat (a lot): */
-#        define FASTLOCK_SUCCEEDED() (*(int *)(&GC_allocate_ml) == 0)
-		/* TRUE if nobody currently holds the lock */
-#    define FASTUNLOCK() PCR_ThCrSec_ExitSys()
-#  endif
-#  ifdef PCR
-#    include <base/PCR_Base.h>
-#    include <th/PCR_Th.h>
-     extern PCR_Th_ML GC_allocate_ml;
-#    define DCL_LOCK_STATE \
-	 PCR_ERes GC_fastLockRes; PCR_sigset_t GC_old_sig_mask
-#    define LOCK() PCR_Th_ML_Acquire(&GC_allocate_ml)
-#    define UNLOCK() PCR_Th_ML_Release(&GC_allocate_ml)
-#    define FASTLOCK() (GC_fastLockRes = PCR_Th_ML_Try(&GC_allocate_ml))
-#    define FASTLOCK_SUCCEEDED() (GC_fastLockRes == PCR_ERes_okay)
-#    define FASTUNLOCK()  {\
-        if( FASTLOCK_SUCCEEDED() ) PCR_Th_ML_Release(&GC_allocate_ml); }
-#  endif
-#  ifdef SRC_M3
-     extern GC_word RT0u__inCritical;
-#    define LOCK() RT0u__inCritical++
-#    define UNLOCK() RT0u__inCritical--
-#  endif
-#  ifdef GC_SOLARIS_THREADS
-#    include <thread.h>
-#    include <signal.h>
-     extern mutex_t GC_allocate_ml;
-#    define LOCK() mutex_lock(&GC_allocate_ml);
-#    define UNLOCK() mutex_unlock(&GC_allocate_ml);
-#  endif
-
-/* Try to define GC_TEST_AND_SET and a matching GC_CLEAR for spin lock	*/
-/* acquisition and release.  We need this for correct operation of the	*/
-/* incremental GC.							*/
-#  ifdef __GNUC__
-#    if defined(I386)
-       inline static int GC_test_and_set(volatile unsigned int *addr) {
-	  int oldval;
-	  /* Note: the "xchg" instruction does not need a "lock" prefix */
-	  __asm__ __volatile__("xchgl %0, %1"
-		: "=r"(oldval), "=m"(*(addr))
-		: "0"(1), "m"(*(addr)) : "memory");
-	  return oldval;
-       }
-#      define GC_TEST_AND_SET_DEFINED
-#    endif
-#    if defined(IA64)
-#     include <ia64intrin.h>
-       inline static int GC_test_and_set(volatile unsigned int *addr) {
-	  return __sync_lock_test_and_set(addr, 1);
-       }
-#      define GC_TEST_AND_SET_DEFINED
-       inline static void GC_clear(volatile unsigned int *addr) {
-	  *addr = 0;
-       }
-#      define GC_CLEAR_DEFINED
-#    endif
-#    ifdef SPARC
-       inline static int GC_test_and_set(volatile unsigned int *addr) {
-	 int oldval;
-
-	 __asm__ __volatile__("ldstub %1,%0"
-	 : "=r"(oldval), "=m"(*addr)
-	 : "m"(*addr) : "memory");
-	 return oldval;
-       }
-#      define GC_TEST_AND_SET_DEFINED
-#    endif
-#    ifdef M68K
-       /* Contributed by Tony Mantler.  I'm not sure how well it was	*/
-       /* tested.							*/
-       inline static int GC_test_and_set(volatile unsigned int *addr) {
-          char oldval; /* this must be no longer than 8 bits */
-
-          /* The return value is semi-phony. */
-          /* 'tas' sets bit 7 while the return */
-          /* value pretends bit 0 was set */
-          __asm__ __volatile__(
-                 "tas %1@; sne %0; negb %0"
-                 : "=d" (oldval)
-                 : "a" (addr) : "memory");
-          return oldval;
-       }
-#      define GC_TEST_AND_SET_DEFINED
-#    endif
-#    if defined(POWERPC)
-#     define GC_TEST_AND_SET_DEFINED
-#     define GC_CLEAR_DEFINED
-#     if (__GNUC__>4)||((__GNUC__==4)&&(__GNUC_MINOR__>=4))
-#       define GC_test_and_set(addr) __sync_lock_test_and_set (addr, 1)
-#       define GC_clear(addr) __sync_lock_release (addr)
-#     else
-        inline static int GC_test_and_set(volatile unsigned int *addr) {
-          int oldval;
-          int temp = 1; /* locked value */
-
-          __asm__ __volatile__(
-               "\n1:\n"
-	       "\tlwarx %0,%y3\n"      /* load and reserve, 32-bits      */
-               "\tcmpwi %0, 0\n"       /* if load is                     */
-               "\tbne 2f\n"            /*   non-zero, return already set */
-               "\tstwcx. %2,%y3\n"     /* else store conditional         */
-               "\tbne- 1b\n"           /* retry if lost reservation      */
-               "\tsync\n"              /* import barrier                 */
-               "2:\t\n"                /* oldval is zero if we set       */
-              : "=&r"(oldval), "=m"(addr)
-              : "r"(temp), "Z"(addr)
-              : "cr0","memory");
-          return oldval;
-        }
-      inline static void GC_clear(volatile unsigned int *addr) {
-	__asm__ __volatile__("lwsync" : : : "memory");
-        *(addr) = 0;
-      }
-#    endif
-#    endif
-#    if defined(ALPHA) 
-        inline static int GC_test_and_set(volatile unsigned int * addr)
-        {
-          unsigned long oldvalue;
-          unsigned long temp;
-
-          __asm__ __volatile__(
-                             "1:     ldl_l %0,%1\n"
-                             "       and %0,%3,%2\n"
-                             "       bne %2,2f\n"
-                             "       xor %0,%3,%0\n"
-                             "       stl_c %0,%1\n"
-#	ifdef __ELF__
-                             "       beq %0,3f\n"
-#	else
-                             "       beq %0,1b\n"
-#	endif
-                             "       mb\n"
-                             "2:\n"
-#	ifdef __ELF__
-                             ".section .text2,\"ax\"\n"
-                             "3:     br 1b\n"
-                             ".previous"
-#	endif
-                             :"=&r" (temp), "=m" (*addr), "=&r" (oldvalue)
-                             :"Ir" (1), "m" (*addr)
-			     :"memory");
-
-          return oldvalue;
-        }
-#       define GC_TEST_AND_SET_DEFINED
-        inline static void GC_clear(volatile unsigned int *addr) {
-          __asm__ __volatile__("mb" : : : "memory");
-          *(addr) = 0;
-        }
-#       define GC_CLEAR_DEFINED
-#    endif /* ALPHA */
-#    ifdef ARM32
-#     define GC_TEST_AND_SET_DEFINED
-#     if (__GNUC__>4)||((__GNUC__==4)&&(__GNUC_MINOR__>=5)) && defined(__ARM_EABI__)
-#       define GC_CLEAR_DEFINED
-#       define GC_test_and_set(addr) __sync_lock_test_and_set (addr, 1)
-#       define GC_clear(addr) __sync_lock_release (addr)
-#     else
-        inline static int GC_test_and_set(volatile unsigned int *addr) {
-          int oldval;
-          /* SWP on ARM is very similar to XCHG on x86.  Doesn't lock the
-           * bus because there are no SMP ARM machines.  If/when there are,
-           * this code will likely need to be updated. */
-          /* See linuxthreads/sysdeps/arm/pt-machine.h in glibc-2.1 */
-          __asm__ __volatile__("swp %0, %1, [%2]"
-      		  	     : "=r"(oldval)
-      			     : "0"(1), "r"(addr)
-			     : "memory");
-          return oldval;
-        }
-#     endif
-#    endif /* ARM32 */
-#    ifdef CRIS
-        inline static int GC_test_and_set(volatile unsigned int *addr) {
-	  /* Ripped from linuxthreads/sysdeps/cris/pt-machine.h.	*/
-	  /* Included with Hans-Peter Nilsson's permission.		*/
-	  register unsigned long int ret;
-
-	  /* Note the use of a dummy output of *addr to expose the write.
-	   * The memory barrier is to stop *other* writes being moved past
-	   * this code.
-	   */
-	    __asm__ __volatile__("clearf\n"
-        		         "0:\n\t"
-                    		 "movu.b [%2],%0\n\t"
-                    		 "ax\n\t"
-                    		 "move.b %3,[%2]\n\t"
-                    		 "bwf 0b\n\t"
-                    		 "clearf"
-                    		 : "=&r" (ret), "=m" (*addr)
-                    		 : "r" (addr), "r" ((int) 1), "m" (*addr)
-                    		 : "memory");
-	    return ret;
-        }
-#       define GC_TEST_AND_SET_DEFINED
-#    endif /* CRIS */
-#    ifdef S390
-       inline static int GC_test_and_set(volatile unsigned int *addr) {
-         int ret;
-         __asm__ __volatile__ (
-          "     l     %0,0(%2)\n"
-          "0:   cs    %0,%1,0(%2)\n"
-          "     jl    0b"
-          : "=&d" (ret)
-          : "d" (1), "a" (addr)
-          : "cc", "memory");
-         return ret;
-       }
-#    endif
-#  endif /* __GNUC__ */
-#  if (defined(ALPHA) && !defined(__GNUC__))
-#    ifndef OSF1
-	--> We currently assume that if gcc is not used, we are
-	--> running under Tru64.
-#    endif
-#    include <machine/builtins.h>
-#    include <c_asm.h>
-#    define GC_test_and_set(addr) __ATOMIC_EXCH_LONG(addr, 1)
-#    define GC_TEST_AND_SET_DEFINED
-#    define GC_clear(addr) { asm("mb"); *(volatile unsigned *)addr = 0; }
-#    define GC_CLEAR_DEFINED
-#  endif
-#  if defined(MSWIN32)
-#    define GC_test_and_set(addr) InterlockedExchange((LPLONG)addr,1)
-#    define GC_TEST_AND_SET_DEFINED
-#  endif
-#  ifdef MIPS
-#    ifdef LINUX
-#      include <sys/tas.h>
-#      define GC_test_and_set(addr) _test_and_set((int *) addr,1)
-#      define GC_TEST_AND_SET_DEFINED
-#    elif __mips < 3 || !(defined (_ABIN32) || defined(_ABI64)) \
-	|| !defined(_COMPILER_VERSION) || _COMPILER_VERSION < 700
-#	 ifdef __GNUC__
-#          define GC_test_and_set(addr) _test_and_set((void *)addr,1)
-#	 else
-#          define GC_test_and_set(addr) test_and_set((void *)addr,1)
-#	 endif
-#    else
-#	 include <sgidefs.h>
-#	 include <mutex.h>
-#	 define GC_test_and_set(addr) __test_and_set32((void *)addr,1)
-#	 define GC_clear(addr) __lock_release(addr);
-#	 define GC_CLEAR_DEFINED
-#    endif
-#    define GC_TEST_AND_SET_DEFINED
-#  endif /* MIPS */
-#  if defined(_AIX)
-#    include <sys/atomic_op.h>
-#    if (defined(_POWER) || defined(_POWERPC)) 
-#      if defined(__GNUC__)  
-         inline static void GC_memsync() {
-           __asm__ __volatile__ ("sync" : : : "memory");
-         }
-#      else
-#        ifndef inline
-#          define inline __inline
-#        endif
-#        pragma mc_func GC_memsync { \
-           "7c0004ac" /* sync (same opcode used for dcs)*/ \
-         }
-#      endif
-#    else 
-#    error dont know how to memsync
-#    endif
-     inline static int GC_test_and_set(volatile unsigned int * addr) {
-          int oldvalue = 0;
-          if (compare_and_swap((void *)addr, &oldvalue, 1)) {
-            GC_memsync();
-            return 0;
-          } else return 1;
-     }
-#    define GC_TEST_AND_SET_DEFINED
-     inline static void GC_clear(volatile unsigned int *addr) {
-          GC_memsync();
-          *(addr) = 0;
-     }
-#    define GC_CLEAR_DEFINED
-
-#  endif
-#  if 0 /* defined(HP_PA) */
-     /* The official recommendation seems to be to not use ldcw from	*/
-     /* user mode.  Since multithreaded incremental collection doesn't	*/
-     /* work anyway on HP_PA, this shouldn't be a major loss.		*/
-
-     /* "set" means 0 and "clear" means 1 here.		*/
-#    define GC_test_and_set(addr) !GC_test_and_clear(addr);
-#    define GC_TEST_AND_SET_DEFINED
-#    define GC_clear(addr) GC_noop1((word)(addr)); *(volatile unsigned int *)addr = 1;
-	/* The above needs a memory barrier! */
-#    define GC_CLEAR_DEFINED
-#  endif
-#  if defined(GC_TEST_AND_SET_DEFINED) && !defined(GC_CLEAR_DEFINED)
-#    ifdef __GNUC__
-       inline static void GC_clear(volatile unsigned int *addr) {
-         /* Try to discourage gcc from moving anything past this. */
-         __asm__ __volatile__(" " : : : "memory");
-         *(addr) = 0;
-       }
-#    else
-	    /* The function call in the following should prevent the	*/
-	    /* compiler from moving assignments to below the UNLOCK.	*/
-#      define GC_clear(addr) GC_noop1((word)(addr)); \
-			     *((volatile unsigned int *)(addr)) = 0;
-#    endif
-#    define GC_CLEAR_DEFINED
-#  endif /* !GC_CLEAR_DEFINED */
-
-#  if !defined(GC_TEST_AND_SET_DEFINED)
-#    define USE_PTHREAD_LOCKS
-#  endif
-
-#  if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-      && !defined(GC_WIN32_THREADS)
-#    define NO_THREAD (pthread_t)(-1)
-#    include <pthread.h>
-#    if defined(PARALLEL_MARK) 
-      /* We need compare-and-swap to update mark bits, where it's	*/
-      /* performance critical.  If USE_MARK_BYTES is defined, it is	*/
-      /* no longer needed for this purpose.  However we use it in	*/
-      /* either case to implement atomic fetch-and-add, though that's	*/
-      /* less performance critical, and could perhaps be done with	*/
-      /* a lock.							*/
-#     if defined(GENERIC_COMPARE_AND_SWAP)
-	/* Probably not useful, except for debugging.	*/
-	/* We do use GENERIC_COMPARE_AND_SWAP on PA_RISC, but we 	*/
-	/* minimize its use.						*/
-	extern pthread_mutex_t GC_compare_and_swap_lock;
-
-	/* Note that if GC_word updates are not atomic, a concurrent 	*/
-	/* reader should acquire GC_compare_and_swap_lock.  On 		*/
-	/* currently supported platforms, such updates are atomic.	*/
-	extern GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-					       GC_word old, GC_word new_val);
-#     endif /* GENERIC_COMPARE_AND_SWAP */
-#     if defined(I386)
-#      if !defined(GENERIC_COMPARE_AND_SWAP)
-         /* Returns TRUE if the comparison succeeded. */
-         inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-		  				       GC_word old,
-						       GC_word new_val) 
-         {
-	   char result;
-	   __asm__ __volatile__("lock; cmpxchgl %2, %0; setz %1"
-	    	: "+m"(*(addr)), "=r"(result)
-		: "r" (new_val), "a"(old) : "memory");
-	   return (GC_bool) result;
-         }
-#      endif /* !GENERIC_COMPARE_AND_SWAP */
-       inline static void GC_memory_barrier()
-       {
-	 /* We believe the processor ensures at least processor	*/
-	 /* consistent ordering.  Thus a compiler barrier	*/
-	 /* should suffice.					*/
-         __asm__ __volatile__("" : : : "memory");
-       }
-#     endif /* I386 */
-
-#     if defined(POWERPC)
-#      if !defined(GENERIC_COMPARE_AND_SWAP)
-#       if CPP_WORDSZ == 64
-        /* Returns TRUE if the comparison succeeded. */
-        inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-            GC_word old, GC_word new_val) 
-        {
-            unsigned long result, dummy;
-            __asm__ __volatile__(
-                "1:\tldarx %0,0,%5\n"
-                  "\tcmpd %0,%4\n"
-                  "\tbne  2f\n"
-                  "\tstdcx. %3,0,%2\n"
-                  "\tbne- 1b\n"
-                  "\tsync\n"
-                  "\tli %1, 1\n"
-                  "\tb 3f\n"
-                "2:\tli %1, 0\n"
-                "3:\t\n"
-                :  "=&r" (dummy), "=r" (result), "=p" (addr)
-                :  "r" (new_val), "r" (old), "2"(addr)
-                : "cr0","memory");
-            return (GC_bool) result;
-        }
-#       else
-        /* Returns TRUE if the comparison succeeded. */
-        inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-            GC_word old, GC_word new_val) 
-        {
-            int result, dummy;
-            __asm__ __volatile__(
-                "1:\tlwarx %0,0,%5\n"
-                  "\tcmpw %0,%4\n"
-                  "\tbne  2f\n"
-                  "\tstwcx. %3,0,%2\n"
-                  "\tbne- 1b\n"
-                  "\tsync\n"
-                  "\tli %1, 1\n"
-                  "\tb 3f\n"
-                "2:\tli %1, 0\n"
-                "3:\t\n"
-                :  "=&r" (dummy), "=r" (result), "=p" (addr)
-                :  "r" (new_val), "r" (old), "2"(addr)
-                : "cr0","memory");
-            return (GC_bool) result;
-        }
-#       endif
-#      endif /* !GENERIC_COMPARE_AND_SWAP */
-        inline static void GC_memory_barrier()
-        {
-            __asm__ __volatile__("sync" : : : "memory");
-        }
-#     endif /* POWERPC */
-
-#     if defined(IA64)
-#      if !defined(GENERIC_COMPARE_AND_SWAP)
-         inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-						       GC_word old,
-						       GC_word new_val) 
-	 {
-	   return __sync_bool_compare_and_swap (addr, old, new_val);
-         }
-#      endif /* !GENERIC_COMPARE_AND_SWAP */
-#      if 0
-	/* Shouldn't be needed; we use volatile stores instead. */
-        inline static void GC_memory_barrier()
-        {
-          __sync_synchronize ();
-        }
-#      endif /* 0 */
-#     endif /* IA64 */
-#     if defined(ALPHA)
-#      if !defined(GENERIC_COMPARE_AND_SWAP)
-#        if defined(__GNUC__)
-           inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-						         GC_word old, GC_word new_val) 
-	   {
-	     unsigned long was_equal;
-             unsigned long temp;
-
-             __asm__ __volatile__(
-                             "1:     ldq_l %0,%1\n"
-                             "       cmpeq %0,%4,%2\n"
-			     "	     mov %3,%0\n"
-                             "       beq %2,2f\n"
-                             "       stq_c %0,%1\n"
-                             "       beq %0,1b\n"
-                             "2:\n"
-                             "       mb\n"
-                             :"=&r" (temp), "=m" (*addr), "=&r" (was_equal)
-                             : "r" (new_val), "Ir" (old)
-			     :"memory");
-             return was_equal;
-           }
-#        else /* !__GNUC__ */
-           inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-						         GC_word old, GC_word new_val) 
-	  {
-	    return __CMP_STORE_QUAD(addr, old, new_val, addr);
-          }
-#        endif /* !__GNUC__ */
-#      endif /* !GENERIC_COMPARE_AND_SWAP */
-#      ifdef __GNUC__
-         inline static void GC_memory_barrier()
-         {
-           __asm__ __volatile__("mb" : : : "memory");
-         }
-#      else
-#	 define GC_memory_barrier() asm("mb")
-#      endif /* !__GNUC__ */
-#     endif /* ALPHA */
-#     if defined(S390)
-#      if !defined(GENERIC_COMPARE_AND_SWAP)
-         inline static GC_bool GC_compare_and_exchange(volatile C_word *addr,
-                                         GC_word old, GC_word new_val)
-         {
-           int retval;
-           __asm__ __volatile__ (
-#            ifndef __s390x__
-               "     cs  %1,%2,0(%3)\n"
-#            else
-               "     csg %1,%2,0(%3)\n"
-#            endif
-             "     ipm %0\n"
-             "     srl %0,28\n"
-             : "=&d" (retval), "+d" (old)
-             : "d" (new_val), "a" (addr)
-             : "cc", "memory");
-           return retval == 0;
-         }
-#      endif
-#     endif
-#     if !defined(GENERIC_COMPARE_AND_SWAP)
-        /* Returns the original value of *addr.	*/
-        inline static GC_word GC_atomic_add(volatile GC_word *addr,
-					    GC_word how_much)
-        {
-	  GC_word old;
-	  do {
-	    old = *addr;
-	  } while (!GC_compare_and_exchange(addr, old, old+how_much));
-          return old;
-        }
-#     else /* GENERIC_COMPARE_AND_SWAP */
-	/* So long as a GC_word can be atomically updated, it should	*/
-	/* be OK to read *addr without a lock.				*/
-	extern GC_word GC_atomic_add(volatile GC_word *addr, GC_word how_much);
-#     endif /* GENERIC_COMPARE_AND_SWAP */
-
-#    endif /* PARALLEL_MARK */
-
-#    if !defined(THREAD_LOCAL_ALLOC) && !defined(USE_PTHREAD_LOCKS)
-      /* In the THREAD_LOCAL_ALLOC case, the allocation lock tends to	*/
-      /* be held for long periods, if it is held at all.  Thus spinning	*/
-      /* and sleeping for fixed periods are likely to result in 	*/
-      /* significant wasted time.  We thus rely mostly on queued locks. */
-#     define USE_SPIN_LOCK
-      extern volatile unsigned int GC_allocate_lock;
-      extern void GC_lock(void);
-	/* Allocation lock holder.  Only set if acquired by client through */
-	/* GC_call_with_alloc_lock.					   */
-#     ifdef GC_ASSERTIONS
-#        define LOCK() \
-		{ if (GC_test_and_set(&GC_allocate_lock)) GC_lock(); \
-		  SET_LOCK_HOLDER(); }
-#        define UNLOCK() \
-		{ GC_ASSERT(I_HOLD_LOCK()); UNSET_LOCK_HOLDER(); \
-	          GC_clear(&GC_allocate_lock); }
-#     else
-#        define LOCK() \
-		{ if (GC_test_and_set(&GC_allocate_lock)) GC_lock(); }
-#        define UNLOCK() \
-		GC_clear(&GC_allocate_lock)
-#     endif /* !GC_ASSERTIONS */
-#     if 0
-	/* Another alternative for OSF1 might be:		*/
-#       include <sys/mman.h>
-        extern msemaphore GC_allocate_semaphore;
-#       define LOCK() { if (msem_lock(&GC_allocate_semaphore, MSEM_IF_NOWAIT) \
- 			    != 0) GC_lock(); else GC_allocate_lock = 1; }
-        /* The following is INCORRECT, since the memory model is too weak. */
-	/* Is this true?  Presumably msem_unlock has the right semantics?  */
-	/*		- HB						   */
-#       define UNLOCK() { GC_allocate_lock = 0; \
-                          msem_unlock(&GC_allocate_semaphore, 0); }
-#     endif /* 0 */
-#    else /* THREAD_LOCAL_ALLOC  || USE_PTHREAD_LOCKS */
-#      ifndef USE_PTHREAD_LOCKS
-#        define USE_PTHREAD_LOCKS
-#      endif
-#    endif /* THREAD_LOCAL_ALLOC */
-#   ifdef USE_PTHREAD_LOCKS
-#      include <pthread.h>
-       extern pthread_mutex_t GC_allocate_ml;
-#      ifdef GC_ASSERTIONS
-#        define LOCK() \
-		{ GC_lock(); \
-		  SET_LOCK_HOLDER(); }
-#        define UNLOCK() \
-		{ GC_ASSERT(I_HOLD_LOCK()); UNSET_LOCK_HOLDER(); \
-	          pthread_mutex_unlock(&GC_allocate_ml); }
-#      else /* !GC_ASSERTIONS */
-#        if defined(NO_PTHREAD_TRYLOCK)
-#          define LOCK() GC_lock();
-#        else /* !defined(NO_PTHREAD_TRYLOCK) */
-#        define LOCK() \
-	   { if (0 != pthread_mutex_trylock(&GC_allocate_ml)) GC_lock(); }
-#        endif
-#        define UNLOCK() pthread_mutex_unlock(&GC_allocate_ml)
-#      endif /* !GC_ASSERTIONS */
-#   endif /* USE_PTHREAD_LOCKS */
-#   define SET_LOCK_HOLDER() GC_lock_holder = pthread_self()
-#   define UNSET_LOCK_HOLDER() GC_lock_holder = NO_THREAD
-#   define I_HOLD_LOCK() (pthread_equal(GC_lock_holder, pthread_self()))
-    extern VOLATILE GC_bool GC_collecting;
-#   define ENTER_GC() GC_collecting = 1;
-#   define EXIT_GC() GC_collecting = 0;
-    extern void GC_lock(void);
-    extern pthread_t GC_lock_holder;
-#   ifdef GC_ASSERTIONS
-      extern pthread_t GC_mark_lock_holder;
-#   endif
-#  endif /* GC_PTHREADS with linux_threads.c implementation */
-#  if defined(GC_WIN32_THREADS)
-#    if defined(GC_PTHREADS)
-#      include <pthread.h>
-       extern pthread_mutex_t GC_allocate_ml;
-#      define LOCK()   pthread_mutex_lock(&GC_allocate_ml)
-#      define UNLOCK() pthread_mutex_unlock(&GC_allocate_ml)
-#    else
-#      include <windows.h>
-       GC_API CRITICAL_SECTION GC_allocate_ml;
-#      define LOCK() EnterCriticalSection(&GC_allocate_ml);
-#      define UNLOCK() LeaveCriticalSection(&GC_allocate_ml);
-#    endif
-#  endif
-#  ifndef SET_LOCK_HOLDER
-#      define SET_LOCK_HOLDER()
-#      define UNSET_LOCK_HOLDER()
-#      define I_HOLD_LOCK() FALSE
-		/* Used on platforms were locks can be reacquired,	*/
-		/* so it doesn't matter if we lie.			*/
-#  endif
-# else /* !THREADS */
-#    define LOCK()
-#    define UNLOCK()
-# endif /* !THREADS */
-# ifndef SET_LOCK_HOLDER
-#   define SET_LOCK_HOLDER()
-#   define UNSET_LOCK_HOLDER()
-#   define I_HOLD_LOCK() FALSE
-		/* Used on platforms were locks can be reacquired,	*/
-		/* so it doesn't matter if we lie.			*/
-# endif
-# ifndef ENTER_GC
-#   define ENTER_GC()
-#   define EXIT_GC()
-# endif
-
-# ifndef DCL_LOCK_STATE
-#   define DCL_LOCK_STATE
-# endif
-# ifndef FASTLOCK
-#   define FASTLOCK() LOCK()
-#   define FASTLOCK_SUCCEEDED() TRUE
-#   define FASTUNLOCK() UNLOCK()
-# endif
-
-#endif /* GC_LOCKS_H */
diff --git a/boehm-gc/include/private/gc_pmark.h b/boehm-gc/include/private/gc_pmark.h
deleted file mode 100644
index 6b15d8ad242..00000000000
--- a/boehm-gc/include/private/gc_pmark.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 2001 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-/* Private declarations of GC marker data structures and macros */
-
-/*
- * Declarations of mark stack.  Needed by marker and client supplied mark
- * routines.  Transitively include gc_priv.h.
- * (Note that gc_priv.h should not be included before this, since this
- * includes dbg_mlc.h, which wants to include gc_priv.h AFTER defining
- * I_HIDE_POINTERS.)
- */
-#ifndef GC_PMARK_H
-# define GC_PMARK_H
-
-# include "gc.h"	/* For configuration */
-
-# if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST)
-#   include "dbg_mlc.h"
-# endif
-# ifndef GC_MARK_H
-#   include "../gc_mark.h"
-# endif
-# ifndef GC_PRIVATE_H
-#   include "gc_priv.h"
-# endif
-
-/* The real declarations of the following is in gc_priv.h, so that	*/
-/* we can avoid scanning the following table.				*/
-/*
-extern mark_proc GC_mark_procs[MAX_MARK_PROCS];
-*/
-
-/*
- * Mark descriptor stuff that should remain private for now, mostly
- * because it's hard to export WORDSZ without including gcconfig.h.
- */
-# define BITMAP_BITS (WORDSZ - GC_DS_TAG_BITS)
-# define PROC(descr) \
-	(GC_mark_procs[((descr) >> GC_DS_TAG_BITS) & (GC_MAX_MARK_PROCS-1)])
-# define ENV(descr) \
-	((descr) >> (GC_DS_TAG_BITS + GC_LOG_MAX_MARK_PROCS))
-# define MAX_ENV \
-  	(((word)1 << (WORDSZ - GC_DS_TAG_BITS - GC_LOG_MAX_MARK_PROCS)) - 1)
-
-
-extern word GC_n_mark_procs;
-
-/* Number of mark stack entries to discard on overflow.	*/
-#define GC_MARK_STACK_DISCARDS (INITIAL_MARK_STACK_SIZE/8)
-
-typedef struct GC_ms_entry {
-    GC_word * mse_start;   /* First word of object */
-    GC_word mse_descr;	/* Descriptor; low order two bits are tags,	*/
-    			/* identifying the upper 30 bits as one of the	*/
-    			/* following:					*/
-} mse;
-
-extern word GC_mark_stack_size;
-
-extern mse * GC_mark_stack_limit;
-
-#ifdef PARALLEL_MARK
-  extern mse * VOLATILE GC_mark_stack_top;
-#else
-  extern mse * GC_mark_stack_top;
-#endif
-
-extern mse * GC_mark_stack;
-
-#ifdef PARALLEL_MARK
-    /*
-     * Allow multiple threads to participate in the marking process.
-     * This works roughly as follows:
-     *  The main mark stack never shrinks, but it can grow.
-     *
-     *	The initiating threads holds the GC lock, and sets GC_help_wanted.
-     *  
-     *  Other threads:
-     *     1) update helper_count (while holding mark_lock.)
-     *	   2) allocate a local mark stack
-     *     repeatedly:
-     *		3) Steal a global mark stack entry by atomically replacing
-     *		   its descriptor with 0.
-     *		4) Copy it to the local stack.
-     *	        5) Mark on the local stack until it is empty, or
-     *		   it may be profitable to copy it back.
-     *	        6) If necessary, copy local stack to global one,
-     *		   holding mark lock.
-     *    7) Stop when the global mark stack is empty.
-     *    8) decrement helper_count (holding mark_lock).
-     *
-     * This is an experiment to see if we can do something along the lines
-     * of the University of Tokyo SGC in a less intrusive, though probably
-     * also less performant, way.
-     */
-    void GC_do_parallel_mark();
-		/* inititate parallel marking.	*/
-
-    extern GC_bool GC_help_wanted;	/* Protected by mark lock	*/
-    extern unsigned GC_helper_count;	/* Number of running helpers.	*/
-					/* Protected by mark lock	*/
-    extern unsigned GC_active_count;	/* Number of active helpers.	*/
-					/* Protected by mark lock	*/
-					/* May increase and decrease	*/
-					/* within each mark cycle.  But	*/
-					/* once it returns to 0, it	*/
-					/* stays zero for the cycle.	*/
-    /* GC_mark_stack_top is also protected by mark lock.	*/
-    extern mse * VOLATILE GC_first_nonempty;
-					/* Lowest entry on mark stack	*/
-					/* that may be nonempty.	*/
-					/* Updated only by initiating 	*/
-					/* thread.			*/
-    /*
-     * GC_notify_all_marker() is used when GC_help_wanted is first set,
-     * when the last helper becomes inactive,
-     * when something is added to the global mark stack, and just after
-     * GC_mark_no is incremented.
-     * This could be split into multiple CVs (and probably should be to
-     * scale to really large numbers of processors.)
-     */
-#endif /* PARALLEL_MARK */
-
-/* Return a pointer to within 1st page of object.  	*/
-/* Set *new_hdr_p to corr. hdr.				*/
-#ifdef __STDC__
-  ptr_t GC_find_start(ptr_t current, hdr *hhdr, hdr **new_hdr_p);
-#else
-  ptr_t GC_find_start();
-#endif
-
-mse * GC_signal_mark_stack_overflow GC_PROTO((mse *msp));
-
-# ifdef GATHERSTATS
-#   define ADD_TO_ATOMIC(sz) GC_atomic_in_use += (sz)
-#   define ADD_TO_COMPOSITE(sz) GC_composite_in_use += (sz)
-# else
-#   define ADD_TO_ATOMIC(sz)
-#   define ADD_TO_COMPOSITE(sz)
-# endif
-
-/* Push the object obj with corresponding heap block header hhdr onto 	*/
-/* the mark stack.							*/
-# define PUSH_OBJ(obj, hhdr, mark_stack_top, mark_stack_limit) \
-{ \
-    register word _descr = (hhdr) -> hb_descr; \
-        \
-    if (_descr == 0) { \
-    	ADD_TO_ATOMIC((hhdr) -> hb_sz); \
-    } else { \
-        ADD_TO_COMPOSITE((hhdr) -> hb_sz); \
-        mark_stack_top++; \
-        if (mark_stack_top >= mark_stack_limit) { \
-          mark_stack_top = GC_signal_mark_stack_overflow(mark_stack_top); \
-        } \
-        mark_stack_top -> mse_start = (obj); \
-        mark_stack_top -> mse_descr = _descr; \
-    } \
-}
-
-/* Push the contents of current onto the mark stack if it is a valid	*/
-/* ptr to a currently unmarked object.  Mark it.			*/
-/* If we assumed a standard-conforming compiler, we could probably	*/
-/* generate the exit_label transparently.				*/
-# define PUSH_CONTENTS(current, mark_stack_top, mark_stack_limit, \
-		       source, exit_label) \
-{ \
-    hdr * my_hhdr; \
-    ptr_t my_current = current; \
- \
-    GET_HDR(my_current, my_hhdr); \
-    if (IS_FORWARDING_ADDR_OR_NIL(my_hhdr)) { \
-	 hdr * new_hdr = GC_invalid_header; \
-         my_current = GC_find_start(my_current, my_hhdr, &new_hdr); \
-         my_hhdr = new_hdr; \
-    } \
-    PUSH_CONTENTS_HDR(my_current, mark_stack_top, mark_stack_limit, \
-		  source, exit_label, my_hhdr);	\
-exit_label: ; \
-}
-
-/* As above, but use header cache for header lookup.	*/
-# define HC_PUSH_CONTENTS(current, mark_stack_top, mark_stack_limit, \
-		       source, exit_label) \
-{ \
-    hdr * my_hhdr; \
-    ptr_t my_current = current; \
- \
-    HC_GET_HDR(my_current, my_hhdr, source); \
-    PUSH_CONTENTS_HDR(my_current, mark_stack_top, mark_stack_limit, \
-		  source, exit_label, my_hhdr);	\
-exit_label: ; \
-}
-
-/* Set mark bit, exit if it was already set.	*/
-
-# ifdef USE_MARK_BYTES
-    /* Unlike the mark bit case, there is a race here, and we may set	*/
-    /* the bit twice in the concurrent case.  This can result in the	*/
-    /* object being pushed twice.  But that's only a performance issue.	*/
-#   define SET_MARK_BIT_EXIT_IF_SET(hhdr,displ,exit_label) \
-    { \
-        register VOLATILE char * mark_byte_addr = \
-				hhdr -> hb_marks + ((displ) >> 1); \
-        register char mark_byte = *mark_byte_addr; \
-          \
-	if (mark_byte) goto exit_label; \
-	*mark_byte_addr = 1;  \
-    } 
-# else
-#   define SET_MARK_BIT_EXIT_IF_SET(hhdr,displ,exit_label) \
-    { \
-        register word * mark_word_addr = hhdr -> hb_marks + divWORDSZ(displ); \
-          \
-        OR_WORD_EXIT_IF_SET(mark_word_addr, (word)1 << modWORDSZ(displ), \
-			    exit_label); \
-    } 
-# endif /* USE_MARK_BYTES */
-
-/* If the mark bit corresponding to current is not set, set it, and 	*/
-/* push the contents of the object on the mark stack.  For a small 	*/
-/* object we assume that current is the (possibly interior) pointer	*/
-/* to the object.  For large objects we assume that current points	*/
-/* to somewhere inside the first page of the object.  If		*/
-/* GC_all_interior_pointers is set, it may have been previously 	*/
-/* adjusted to make that true.						*/
-# define PUSH_CONTENTS_HDR(current, mark_stack_top, mark_stack_limit, \
-		           source, exit_label, hhdr) \
-{ \
-    int displ;  /* Displacement in block; first bytes, then words */ \
-    int map_entry; \
-    \
-    displ = HBLKDISPL(current); \
-    map_entry = MAP_ENTRY((hhdr -> hb_map), displ); \
-    displ = BYTES_TO_WORDS(displ); \
-    if (map_entry > CPP_MAX_OFFSET) { \
-	if (map_entry == OFFSET_TOO_BIG) { \
-	  map_entry = displ % (hhdr -> hb_sz); \
-	  displ -= map_entry; \
-	  if (displ + (hhdr -> hb_sz) > BYTES_TO_WORDS(HBLKSIZE)) { \
-	    GC_ADD_TO_BLACK_LIST_NORMAL((word)current, source); \
-	    goto exit_label; \
-	  } \
-	} else { \
-          GC_ADD_TO_BLACK_LIST_NORMAL((word)current, source); goto exit_label; \
-	} \
-    } else { \
-        displ -= map_entry; \
-    } \
-    GC_ASSERT(displ >= 0 && displ < MARK_BITS_PER_HBLK); \
-    SET_MARK_BIT_EXIT_IF_SET(hhdr, displ, exit_label); \
-    GC_STORE_BACK_PTR((ptr_t)source, (ptr_t)HBLKPTR(current) \
-				      + WORDS_TO_BYTES(displ)); \
-    PUSH_OBJ(((word *)(HBLKPTR(current)) + displ), hhdr, \
-    	     mark_stack_top, mark_stack_limit) \
-}
-
-#if defined(PRINT_BLACK_LIST) || defined(KEEP_BACK_PTRS)
-#   define PUSH_ONE_CHECKED_STACK(p, source) \
-	GC_mark_and_push_stack(p, (ptr_t)(source))
-#else
-#   define PUSH_ONE_CHECKED_STACK(p, source) \
-	GC_mark_and_push_stack(p)
-#endif
-
-/*
- * Push a single value onto mark stack. Mark from the object pointed to by p.
- * Invoke FIXUP_POINTER(p) before any further processing.
- * P is considered valid even if it is an interior pointer.
- * Previously marked objects are not pushed.  Hence we make progress even
- * if the mark stack overflows.
- */
-
-# if NEED_FIXUP_POINTER
-    /* Try both the raw version and the fixed up one.	*/
-#   define GC_PUSH_ONE_STACK(p, source) \
-      if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr 	\
-	 && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) {	\
-	 PUSH_ONE_CHECKED_STACK(p, source);	\
-      } \
-      FIXUP_POINTER(p); \
-      if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr 	\
-	 && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) {	\
-	 PUSH_ONE_CHECKED_STACK(p, source);	\
-      }
-# else /* !NEED_FIXUP_POINTER */
-#   define GC_PUSH_ONE_STACK(p, source) \
-      if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr 	\
-	 && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) {	\
-	 PUSH_ONE_CHECKED_STACK(p, source);	\
-      }
-# endif
-
-
-/*
- * As above, but interior pointer recognition as for
- * normal for heap pointers.
- */
-# define GC_PUSH_ONE_HEAP(p,source) \
-    FIXUP_POINTER(p); \
-    if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr 	\
-	 && (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) {	\
-	    GC_mark_stack_top = GC_mark_and_push( \
-			    (GC_PTR)(p), GC_mark_stack_top, \
-			    GC_mark_stack_limit, (GC_PTR *)(source)); \
-    }
-
-/* Mark starting at mark stack entry top (incl.) down to	*/
-/* mark stack entry bottom (incl.).  Stop after performing	*/
-/* about one page worth of work.  Return the new mark stack	*/
-/* top entry.							*/
-mse * GC_mark_from GC_PROTO((mse * top, mse * bottom, mse *limit));
-
-#define MARK_FROM_MARK_STACK() \
-	GC_mark_stack_top = GC_mark_from(GC_mark_stack_top, \
-					 GC_mark_stack, \
-					 GC_mark_stack + GC_mark_stack_size);
-
-/*
- * Mark from one finalizable object using the specified
- * mark proc. May not mark the object pointed to by 
- * real_ptr. That is the job of the caller, if appropriate
- */
-# define GC_MARK_FO(real_ptr, mark_proc) \
-{ \
-    (*(mark_proc))(real_ptr); \
-    while (!GC_mark_stack_empty()) MARK_FROM_MARK_STACK(); \
-    if (GC_mark_state != MS_NONE) { \
-        GC_set_mark_bit(real_ptr); \
-        while (!GC_mark_some((ptr_t)0)) {} \
-    } \
-}
-
-extern GC_bool GC_mark_stack_too_small;
-				/* We need a larger mark stack.  May be	*/
-				/* set by client supplied mark routines.*/
-
-typedef int mark_state_t;	/* Current state of marking, as follows:*/
-				/* Used to remember where we are during */
-				/* concurrent marking.			*/
-
-				/* We say something is dirty if it was	*/
-				/* written since the last time we	*/
-				/* retrieved dirty bits.  We say it's 	*/
-				/* grungy if it was marked dirty in the	*/
-				/* last set of bits we retrieved.	*/
-				
-				/* Invariant I: all roots and marked	*/
-				/* objects p are either dirty, or point */
-				/* to objects q that are either marked 	*/
-				/* or a pointer to q appears in a range	*/
-				/* on the mark stack.			*/
-
-# define MS_NONE 0		/* No marking in progress. I holds.	*/
-				/* Mark stack is empty.			*/
-
-# define MS_PUSH_RESCUERS 1	/* Rescuing objects are currently 	*/
-				/* being pushed.  I holds, except	*/
-				/* that grungy roots may point to 	*/
-				/* unmarked objects, as may marked	*/
-				/* grungy objects above scan_ptr.	*/
-
-# define MS_PUSH_UNCOLLECTABLE 2
-				/* I holds, except that marked 		*/
-				/* uncollectable objects above scan_ptr */
-				/* may point to unmarked objects.	*/
-				/* Roots may point to unmarked objects	*/
-
-# define MS_ROOTS_PUSHED 3	/* I holds, mark stack may be nonempty  */
-
-# define MS_PARTIALLY_INVALID 4	/* I may not hold, e.g. because of M.S. */
-				/* overflow.  However marked heap	*/
-				/* objects below scan_ptr point to	*/
-				/* marked or stacked objects.		*/
-
-# define MS_INVALID 5		/* I may not hold.			*/
-
-extern mark_state_t GC_mark_state;
-
-#endif  /* GC_PMARK_H */
-
diff --git a/boehm-gc/include/private/gc_priv.h b/boehm-gc/include/private/gc_priv.h
deleted file mode 100644
index 4dbfa7d1fed..00000000000
--- a/boehm-gc/include/private/gc_priv.h
+++ /dev/null
@@ -1,2015 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999-2001 by Hewlett-Packard Company. All rights reserved.
- *
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
- 
-
-# ifndef GC_PRIVATE_H
-# define GC_PRIVATE_H
-
-/* Autoconf definitions. */
-/* FIXME: This should really be included directly from each .c file. */
-#include <gc_config.h>
-
-#if defined(mips) && defined(SYSTYPE_BSD) && defined(sony_news)
-    /* sony RISC NEWS, NEWSOS 4 */
-#   define BSD_TIME
-/*    typedef long ptrdiff_t;   -- necessary on some really old systems	*/
-#endif
-
-#if defined(mips) && defined(SYSTYPE_BSD43)
-    /* MIPS RISCOS 4 */
-#   define BSD_TIME
-#endif
-
-#ifdef DGUX
-#   include <sys/types.h>
-#   include <sys/time.h>
-#   include <sys/resource.h>
-#endif /* DGUX */
-
-#ifdef BSD_TIME
-#   include <sys/types.h>
-#   include <sys/time.h>
-#   include <sys/resource.h>
-#endif /* BSD_TIME */
-
-# ifndef _GC_H
-#   include "../gc.h"
-# endif
-
-# ifndef GC_MARK_H
-#   include "../gc_mark.h"
-# endif
-
-typedef GC_word word;
-typedef GC_signed_word signed_word;
-
-typedef int GC_bool;
-# define TRUE 1
-# define FALSE 0
-
-typedef char * ptr_t;	/* A generic pointer to which we can add	*/
-			/* byte displacements.				*/
-			/* Preferably identical to caddr_t, if it 	*/
-			/* exists.					*/
-			
-# ifndef GCCONFIG_H
-#   include "gcconfig.h"
-# endif
-
-# ifndef HEADERS_H
-#   include "gc_hdrs.h"
-# endif
-
-#if defined(__STDC__)
-#   include <stdlib.h>
-#   if !(defined( sony_news ) )
-#       include <stddef.h>
-#   endif
-#   define VOLATILE volatile
-#else
-#   ifdef MSWIN32
-#   	include <stdlib.h>
-#   endif
-#   define VOLATILE
-#endif
-
-#if 0 /* defined(__GNUC__) doesn't work yet */
-# define EXPECT(expr, outcome) __builtin_expect(expr,outcome)
-  /* Equivalent to (expr), but predict that usually (expr)==outcome. */
-#else
-# define EXPECT(expr, outcome) (expr)
-#endif /* __GNUC__ */
-
-# ifndef GC_LOCKS_H
-#   include "gc_locks.h"
-# endif
-
-# ifdef STACK_GROWS_DOWN
-#   define COOLER_THAN >
-#   define HOTTER_THAN <
-#   define MAKE_COOLER(x,y) if ((word)(x)+(y) > (word)(x)) {(x) += (y);} \
-			    else {(x) = (word)ONES;}
-#   define MAKE_HOTTER(x,y) (x) -= (y)
-# else
-#   define COOLER_THAN <
-#   define HOTTER_THAN >
-#   define MAKE_COOLER(x,y) if ((word)(x)-(y) < (word)(x)) {(x) -= (y);} else {(x) = 0;}
-#   define MAKE_HOTTER(x,y) (x) += (y)
-# endif
-
-#if defined(AMIGA) && defined(__SASC)
-#   define GC_FAR __far
-#else
-#   define GC_FAR
-#endif
-
-
-/*********************************/
-/*                               */
-/* Definitions for conservative  */
-/* collector                     */
-/*                               */
-/*********************************/
-
-/*********************************/
-/*                               */
-/* Easily changeable parameters  */
-/*                               */
-/*********************************/
-
-/* #define STUBBORN_ALLOC */
-		    /* Enable stubborm allocation, and thus a limited	*/
-		    /* form of incremental collection w/o dirty bits.	*/
-
-/* #define ALL_INTERIOR_POINTERS */
-		    /* Forces all pointers into the interior of an 	*/
-		    /* object to be considered valid.  Also causes the	*/
-		    /* sizes of all objects to be inflated by at least 	*/
-		    /* one byte.  This should suffice to guarantee	*/
-		    /* that in the presence of a compiler that does	*/
-		    /* not perform garbage-collector-unsafe		*/
-		    /* optimizations, all portable, strictly ANSI	*/
-		    /* conforming C programs should be safely usable	*/
-		    /* with malloc replaced by GC_malloc and free	*/
-		    /* calls removed.  There are several disadvantages: */
-		    /* 1. There are probably no interesting, portable,	*/
-		    /*    strictly ANSI	conforming C programs.		*/
-		    /* 2. This option makes it hard for the collector	*/
-		    /*    to allocate space that is not ``pointed to''  */
-		    /*    by integers, etc.  Under SunOS 4.X with a 	*/
-		    /*    statically linked libc, we empiricaly		*/
-		    /*    observed that it would be difficult to 	*/
-		    /*	  allocate individual objects larger than 100K.	*/
-		    /* 	  Even if only smaller objects are allocated,	*/
-		    /*    more swap space is likely to be needed.       */
-		    /*    Fortunately, much of this will never be	*/
-		    /*    touched.					*/
-		    /* If you can easily avoid using this option, do.	*/
-		    /* If not, try to keep individual objects small.	*/
-		    /* This is now really controlled at startup,	*/
-		    /* through GC_all_interior_pointers.		*/
-		    
-#define PRINTSTATS  /* Print garbage collection statistics          	*/
-		    /* For less verbose output, undefine in reclaim.c 	*/
-
-#define PRINTTIMES  /* Print the amount of time consumed by each garbage   */
-		    /* collection.                                         */
-
-#define PRINTBLOCKS /* Print object sizes associated with heap blocks,     */
-		    /* whether the objects are atomic or composite, and    */
-		    /* whether or not the block was found to be empty      */
-		    /* during the reclaim phase.  Typically generates       */
-		    /* about one screenful per garbage collection.         */
-#undef PRINTBLOCKS
-
-#ifdef SILENT
-#  ifdef PRINTSTATS
-#    undef PRINTSTATS
-#  endif
-#  ifdef PRINTTIMES
-#    undef PRINTTIMES
-#  endif
-#  ifdef PRINTNBLOCKS
-#    undef PRINTNBLOCKS
-#  endif
-#endif
-
-#if defined(PRINTSTATS) && !defined(GATHERSTATS)
-#   define GATHERSTATS
-#endif
-
-#if defined(PRINTSTATS) || !defined(SMALL_CONFIG)
-#   define CONDPRINT  /* Print some things if GC_print_stats is set */
-#endif
-
-#define GC_INVOKE_FINALIZERS() GC_notify_or_invoke_finalizers()
-
-#define MERGE_SIZES /* Round up some object sizes, so that fewer distinct */
-		    /* free lists are actually maintained.  This applies  */
-		    /* only to the top level routines in misc.c, not to   */
-		    /* user generated code that calls GC_allocobj and     */
-		    /* GC_allocaobj directly.                             */
-		    /* Slows down average programs slightly.  May however */
-		    /* substantially reduce fragmentation if allocation   */
-		    /* request sizes are widely scattered.                */
-		    /* May save significant amounts of space for obj_map  */
-		    /* entries.						  */
-
-#if defined(USE_MARK_BYTES) && !defined(ALIGN_DOUBLE)
-#  define ALIGN_DOUBLE
-   /* We use one byte for every 2 words, which doesn't allow for	*/
-   /* odd numbered words to have mark bits.				*/
-#endif
-
-#if defined(GC_GCJ_SUPPORT) && ALIGNMENT < 8 && !defined(ALIGN_DOUBLE)
-   /* GCJ's Hashtable synchronization code requires 64-bit alignment.  */
-#  define ALIGN_DOUBLE
-#endif
-
-/* ALIGN_DOUBLE requires MERGE_SIZES at present. */
-# if defined(ALIGN_DOUBLE) && !defined(MERGE_SIZES)
-#   define MERGE_SIZES
-# endif
-
-#if !defined(DONT_ADD_BYTE_AT_END)
-# define EXTRA_BYTES GC_all_interior_pointers
-#else
-# define EXTRA_BYTES 0
-#endif
-
-
-# ifndef LARGE_CONFIG
-#   define MINHINCR 16	 /* Minimum heap increment, in blocks of HBLKSIZE  */
-			 /* Must be multiple of largest page size.	   */
-#   define MAXHINCR 2048 /* Maximum heap increment, in blocks              */
-# else
-#   define MINHINCR 64
-#   define MAXHINCR 4096
-# endif
-
-# define TIME_LIMIT 50	   /* We try to keep pause times from exceeding	 */
-			   /* this by much. In milliseconds.		 */
-
-# define BL_LIMIT GC_black_list_spacing
-			   /* If we need a block of N bytes, and we have */
-			   /* a block of N + BL_LIMIT bytes available, 	 */
-			   /* and N > BL_LIMIT,				 */
-			   /* but all possible positions in it are 	 */
-			   /* blacklisted, we just use it anyway (and	 */
-			   /* print a warning, if warnings are enabled). */
-			   /* This risks subsequently leaking the block	 */
-			   /* due to a false reference.  But not using	 */
-			   /* the block risks unreasonable immediate	 */
-			   /* heap growth.				 */
-
-/*********************************/
-/*                               */
-/* Stack saving for debugging	 */
-/*                               */
-/*********************************/
-
-#ifdef NEED_CALLINFO
-    struct callinfo {
-	word ci_pc;  	/* Caller, not callee, pc	*/
-#	if NARGS > 0
-	    word ci_arg[NARGS];	/* bit-wise complement to avoid retention */
-#	endif
-#	if defined(ALIGN_DOUBLE) && (NFRAMES * (NARGS + 1)) % 2 == 1
-	    /* Likely alignment problem. */
-	    word ci_dummy;
-#	endif
-    };
-#endif
-
-#ifdef SAVE_CALL_CHAIN
-
-/* Fill in the pc and argument information for up to NFRAMES of my	*/
-/* callers.  Ignore my frame and my callers frame.			*/
-void GC_save_callers GC_PROTO((struct callinfo info[NFRAMES]));
-  
-void GC_print_callers GC_PROTO((struct callinfo info[NFRAMES]));
-
-#endif
-
-
-/*********************************/
-/*                               */
-/* OS interface routines	 */
-/*                               */
-/*********************************/
-
-#ifdef BSD_TIME
-#   undef CLOCK_TYPE
-#   undef GET_TIME
-#   undef MS_TIME_DIFF
-#   define CLOCK_TYPE struct timeval
-#   define GET_TIME(x) { struct rusage rusage; \
-			 getrusage (RUSAGE_SELF,  &rusage); \
-			 x = rusage.ru_utime; }
-#   define MS_TIME_DIFF(a,b) ((double) (a.tv_sec - b.tv_sec) * 1000.0 \
-                               + (double) (a.tv_usec - b.tv_usec) / 1000.0)
-#else /* !BSD_TIME */
-# if defined(MSWIN32) || defined(MSWINCE)
-#   include <windows.h>
-#   include <winbase.h>
-#   define CLOCK_TYPE DWORD
-#   define GET_TIME(x) x = GetTickCount()
-#   define MS_TIME_DIFF(a,b) ((long)((a)-(b)))
-# else /* !MSWIN32, !MSWINCE, !BSD_TIME */
-#   include <time.h>
-#   if !defined(__STDC__) && defined(SPARC) && defined(SUNOS4)
-      clock_t clock();	/* Not in time.h, where it belongs	*/
-#   endif
-#   if defined(FREEBSD) && !defined(CLOCKS_PER_SEC)
-#     include <machine/limits.h>
-#     define CLOCKS_PER_SEC CLK_TCK
-#   endif
-#   if !defined(CLOCKS_PER_SEC)
-#     define CLOCKS_PER_SEC 1000000
-/*
- * This is technically a bug in the implementation.  ANSI requires that
- * CLOCKS_PER_SEC be defined.  But at least under SunOS4.1.1, it isn't.
- * Also note that the combination of ANSI C and POSIX is incredibly gross
- * here. The type clock_t is used by both clock() and times().  But on
- * some machines these use different notions of a clock tick,  CLOCKS_PER_SEC
- * seems to apply only to clock.  Hence we use it here.  On many machines,
- * including SunOS, clock actually uses units of microseconds (which are
- * not really clock ticks).
- */
-#   endif
-#   define CLOCK_TYPE clock_t
-#   define GET_TIME(x) x = clock()
-#   define MS_TIME_DIFF(a,b) ((unsigned long) \
-		(1000.0*(double)((a)-(b))/(double)CLOCKS_PER_SEC))
-# endif /* !MSWIN32 */
-#endif /* !BSD_TIME */
-
-/* We use bzero and bcopy internally.  They may not be available.	*/
-# if defined(SPARC) && defined(SUNOS4)
-#   define BCOPY_EXISTS
-# endif
-# if defined(M68K) && defined(AMIGA)
-#   define BCOPY_EXISTS
-# endif
-# if defined(M68K) && defined(NEXT)
-#   define BCOPY_EXISTS
-# endif
-# if defined(VAX)
-#   define BCOPY_EXISTS
-# endif
-# if defined(AMIGA)
-#   include <string.h>
-#   define BCOPY_EXISTS
-# endif
-# if defined(DARWIN)
-#   include <string.h>
-#   define BCOPY_EXISTS
-# endif
-
-# ifndef BCOPY_EXISTS
-#   include <string.h>
-#   define BCOPY(x,y,n) memcpy(y, x, (size_t)(n))
-#   define BZERO(x,n)  memset(x, 0, (size_t)(n))
-# else
-#   define BCOPY(x,y,n) bcopy((char *)(x),(char *)(y),(int)(n))
-#   define BZERO(x,n) bzero((char *)(x),(int)(n))
-# endif
-
-/* Delay any interrupts or signals that may abort this thread.  Data	*/
-/* structures are in a consistent state outside this pair of calls.	*/
-/* ANSI C allows both to be empty (though the standard isn't very	*/
-/* clear on that point).  Standard malloc implementations are usually	*/
-/* neither interruptable nor thread-safe, and thus correspond to	*/
-/* empty definitions.							*/
-/* It probably doesn't make any sense to declare these to be nonempty	*/
-/* if the code is being optimized, since signal safety relies on some	*/
-/* ordering constraints that are typically not obeyed by optimizing	*/
-/* compilers.								*/
-# ifdef PCR
-#   define DISABLE_SIGNALS() \
-		 PCR_Th_SetSigMask(PCR_allSigsBlocked,&GC_old_sig_mask)
-#   define ENABLE_SIGNALS() \
-		PCR_Th_SetSigMask(&GC_old_sig_mask, NIL)
-# else
-#   if defined(THREADS) || defined(AMIGA)  \
-	|| defined(MSWIN32) || defined(MSWINCE) || defined(MACOS) \
-	|| defined(DJGPP) || defined(NO_SIGNALS) 
-			/* Also useful for debugging.		*/
-	/* Should probably use thr_sigsetmask for GC_SOLARIS_THREADS. */
-#     define DISABLE_SIGNALS()
-#     define ENABLE_SIGNALS()
-#   else
-#     define DISABLE_SIGNALS() GC_disable_signals()
-	void GC_disable_signals();
-#     define ENABLE_SIGNALS() GC_enable_signals()
-	void GC_enable_signals();
-#   endif
-# endif
-
-/*
- * Stop and restart mutator threads.
- */
-# ifdef PCR
-#     include "th/PCR_ThCtl.h"
-#     define STOP_WORLD() \
- 	PCR_ThCtl_SetExclusiveMode(PCR_ThCtl_ExclusiveMode_stopNormal, \
- 				   PCR_allSigsBlocked, \
- 				   PCR_waitForever)
-#     define START_WORLD() \
-	PCR_ThCtl_SetExclusiveMode(PCR_ThCtl_ExclusiveMode_null, \
- 				   PCR_allSigsBlocked, \
- 				   PCR_waitForever);
-# else
-#   if defined(GC_SOLARIS_THREADS) || defined(GC_WIN32_THREADS) \
-	|| defined(GC_PTHREADS)
-      void GC_stop_world();
-      void GC_start_world();
-#     define STOP_WORLD() GC_stop_world()
-#     define START_WORLD() GC_start_world()
-#   else
-#     define STOP_WORLD()
-#     define START_WORLD()
-#   endif
-# endif
-
-/* Abandon ship */
-# ifdef PCR
-#   define ABORT(s) PCR_Base_Panic(s)
-# else
-#   ifdef SMALL_CONFIG
-#	define ABORT(msg) abort();
-#   else
-	GC_API void GC_abort GC_PROTO((GC_CONST char * msg));
-#       define ABORT(msg) GC_abort(msg);
-#   endif
-# endif
-
-/* Exit abnormally, but without making a mess (e.g. out of memory) */
-# ifdef PCR
-#   define EXIT() PCR_Base_Exit(1,PCR_waitForever)
-# else
-#   define EXIT() (void)exit(1)
-# endif
-
-/* Print warning message, e.g. almost out of memory.	*/
-# define WARN(msg,arg) (*GC_current_warn_proc)("GC Warning: " msg, (GC_word)(arg))
-extern GC_warn_proc GC_current_warn_proc;
-
-/* Get environment entry */
-#if !defined(NO_GETENV)
-#   if defined(EMPTY_GETENV_RESULTS)
-	/* Workaround for a reputed Wine bug.	*/
-	static inline char * fixed_getenv(const char *name)
-	{
-	  char * tmp = getenv(name);
-	  if (tmp == 0 || strlen(tmp) == 0)
-	    return 0;
-	  return tmp;
-	}
-#       define GETENV(name) fixed_getenv(name)
-#   else
-#       define GETENV(name) getenv(name)
-#   endif
-#else
-#   define GETENV(name) 0
-#endif
-
-#if defined(DARWIN)
-#      if defined(POWERPC)
-#              if CPP_WORDSZ == 32
-#                define GC_THREAD_STATE_T ppc_thread_state_t
-#		 define GC_MACH_THREAD_STATE PPC_THREAD_STATE
-#		 define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE_COUNT
-#                define GC_MACH_HEADER mach_header
-#                define GC_MACH_SECTION section
-#                define GC_GETSECTBYNAME getsectbynamefromheader
-#              else
-#                define GC_THREAD_STATE_T ppc_thread_state64_t
-#		 define GC_MACH_THREAD_STATE PPC_THREAD_STATE64
-#		 define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE64_COUNT
-#                define GC_MACH_HEADER mach_header_64
-#                define GC_MACH_SECTION section_64
-#                define GC_GETSECTBYNAME getsectbynamefromheader_64
-#              endif
-#      elif defined(I386) || defined(X86_64)
-#              if CPP_WORDSZ == 32
-#                define GC_THREAD_STATE_T x86_thread_state32_t
-#                define GC_MACH_THREAD_STATE x86_THREAD_STATE32
-#                define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE32_COUNT
-#                define GC_MACH_HEADER mach_header
-#                define GC_MACH_SECTION section
-#                define GC_GETSECTBYNAME getsectbynamefromheader
-#              else
-#                define GC_THREAD_STATE_T x86_thread_state64_t
-#                define GC_MACH_THREAD_STATE x86_THREAD_STATE64
-#                define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
-#                define GC_MACH_HEADER mach_header_64
-#                define GC_MACH_SECTION section_64
-#                define GC_GETSECTBYNAME getsectbynamefromheader_64
-#              endif
-#      else
-#              error define GC_THREAD_STATE_T
-#              define GC_MACH_THREAD_STATE MACHINE_THREAD_STATE
-#              define GC_MACH_THREAD_STATE_COUNT MACHINE_THREAD_STATE_COUNT
-#      endif
-/* Try to work out the right way to access thread state structure members.
-   The structure has changed its definition in different Darwin versions.
-   This now defaults to the (older) names without __, thus hopefully,
-   not breaking any existing Makefile.direct builds.  */
-#      if defined (HAS_PPC_THREAD_STATE___R0) \
-	 || defined (HAS_PPC_THREAD_STATE64___R0) \
-	 || defined (HAS_X86_THREAD_STATE32___EAX) \
-	 || defined (HAS_X86_THREAD_STATE64___RAX)
-#        define THREAD_FLD(x) __ ## x
-#      else
-#        define THREAD_FLD(x) x
-#      endif
-#endif
-/*********************************/
-/*                               */
-/* Word-size-dependent defines   */
-/*                               */
-/*********************************/
-
-#if CPP_WORDSZ == 32
-#  define WORDS_TO_BYTES(x)   ((x)<<2)
-#  define BYTES_TO_WORDS(x)   ((x)>>2)
-#  define LOGWL               ((word)5)    /* log[2] of CPP_WORDSZ */
-#  define modWORDSZ(n) ((n) & 0x1f)        /* n mod size of word	    */
-#  if ALIGNMENT != 4
-#	define UNALIGNED
-#  endif
-#endif
-
-#if CPP_WORDSZ == 64
-#  define WORDS_TO_BYTES(x)   ((x)<<3)
-#  define BYTES_TO_WORDS(x)   ((x)>>3)
-#  define LOGWL               ((word)6)    /* log[2] of CPP_WORDSZ */
-#  define modWORDSZ(n) ((n) & 0x3f)        /* n mod size of word	    */
-#  if ALIGNMENT != 8
-#	define UNALIGNED
-#  endif
-#endif
-
-#define WORDSZ ((word)CPP_WORDSZ)
-#define SIGNB  ((word)1 << (WORDSZ-1))
-#define BYTES_PER_WORD      ((word)(sizeof (word)))
-#define ONES                ((word)(signed_word)(-1))
-#define divWORDSZ(n) ((n) >> LOGWL)	   /* divide n by size of word      */
-
-/*********************/
-/*                   */
-/*  Size Parameters  */
-/*                   */
-/*********************/
-
-/*  heap block size, bytes. Should be power of 2 */
-
-#ifndef HBLKSIZE
-# ifdef SMALL_CONFIG
-#   define CPP_LOG_HBLKSIZE 10
-# else
-#   if (CPP_WORDSZ == 32) || (defined(HPUX) && defined(HP_PA))
-      /* HPUX/PA seems to use 4K pages with the 64 bit ABI */
-#     define CPP_LOG_HBLKSIZE 12
-#   else
-#     define CPP_LOG_HBLKSIZE 13
-#   endif
-# endif
-#else
-# if HBLKSIZE == 512
-#   define CPP_LOG_HBLKSIZE 9
-# endif
-# if HBLKSIZE == 1024
-#   define CPP_LOG_HBLKSIZE 10
-# endif
-# if HBLKSIZE == 2048
-#   define CPP_LOG_HBLKSIZE 11
-# endif
-# if HBLKSIZE == 4096
-#   define CPP_LOG_HBLKSIZE 12
-# endif
-# if HBLKSIZE == 8192
-#   define CPP_LOG_HBLKSIZE 13
-# endif
-# if HBLKSIZE == 16384
-#   define CPP_LOG_HBLKSIZE 14
-# endif
-# ifndef CPP_LOG_HBLKSIZE
-    --> fix HBLKSIZE
-# endif
-# undef HBLKSIZE
-#endif
-# define CPP_HBLKSIZE (1 << CPP_LOG_HBLKSIZE)
-# define LOG_HBLKSIZE   ((word)CPP_LOG_HBLKSIZE)
-# define HBLKSIZE ((word)CPP_HBLKSIZE)
-
-
-/*  max size objects supported by freelist (larger objects may be   */
-/*  allocated, but less efficiently)                                */
-
-#define CPP_MAXOBJBYTES (CPP_HBLKSIZE/2)
-#define MAXOBJBYTES ((word)CPP_MAXOBJBYTES)
-#define CPP_MAXOBJSZ    BYTES_TO_WORDS(CPP_MAXOBJBYTES)
-#define MAXOBJSZ ((word)CPP_MAXOBJSZ)
-		
-# define divHBLKSZ(n) ((n) >> LOG_HBLKSIZE)
-
-# define HBLK_PTR_DIFF(p,q) divHBLKSZ((ptr_t)p - (ptr_t)q)
-	/* Equivalent to subtracting 2 hblk pointers.	*/
-	/* We do it this way because a compiler should	*/
-	/* find it hard to use an integer division	*/
-	/* instead of a shift.  The bundled SunOS 4.1	*/
-	/* o.w. sometimes pessimizes the subtraction to	*/
-	/* involve a call to .div.			*/
- 
-# define modHBLKSZ(n) ((n) & (HBLKSIZE-1))
- 
-# define HBLKPTR(objptr) ((struct hblk *)(((word) (objptr)) & ~(HBLKSIZE-1)))
-
-# define HBLKDISPL(objptr) (((word) (objptr)) & (HBLKSIZE-1))
-
-/* Round up byte allocation requests to integral number of words, etc. */
-# define ROUNDED_UP_WORDS(n) \
-	BYTES_TO_WORDS((n) + (WORDS_TO_BYTES(1) - 1 + EXTRA_BYTES))
-# ifdef ALIGN_DOUBLE
-#       define ALIGNED_WORDS(n) \
-	    (BYTES_TO_WORDS((n) + WORDS_TO_BYTES(2) - 1 + EXTRA_BYTES) & ~1)
-# else
-#       define ALIGNED_WORDS(n) ROUNDED_UP_WORDS(n)
-# endif
-# define SMALL_OBJ(bytes) ((bytes) <= (MAXOBJBYTES - EXTRA_BYTES))
-# define ADD_SLOP(bytes) ((bytes) + EXTRA_BYTES)
-# ifndef MIN_WORDS
-    /* MIN_WORDS is the size of the smallest allocated object.	*/
-    /* 1 and 2 are the only valid values.			*/
-    /* 2 must be used if:					*/
-    /* - GC_gcj_malloc can be used for objects of requested 	*/
-    /*   size  smaller than 2 words, or				*/
-    /* - USE_MARK_BYTES is defined.				*/
-#   if defined(USE_MARK_BYTES) || defined(GC_GCJ_SUPPORT)
-#     define MIN_WORDS 2   	/* Smallest allocated object.	*/
-#   else
-#     define MIN_WORDS 1
-#   endif
-# endif
-
-
-/*
- * Hash table representation of sets of pages.  This assumes it is
- * OK to add spurious entries to sets.
- * Used by black-listing code, and perhaps by dirty bit maintenance code.
- */
- 
-# ifdef LARGE_CONFIG
-#   define LOG_PHT_ENTRIES  20  /* Collisions likely at 1M blocks,	*/
-				/* which is >= 4GB.  Each table takes	*/
-				/* 128KB, some of which may never be	*/
-				/* touched.				*/
-# else
-#   ifdef SMALL_CONFIG
-#     define LOG_PHT_ENTRIES  14 /* Collisions are likely if heap grows	*/
-				 /* to more than 16K hblks = 64MB.	*/
-				 /* Each hash table occupies 2K bytes.   */
-#   else /* default "medium" configuration */
-#     define LOG_PHT_ENTRIES  16 /* Collisions are likely if heap grows	*/
-				 /* to more than 64K hblks >= 256MB.	*/
-				 /* Each hash table occupies 8K bytes.  */
-				 /* Even for somewhat smaller heaps, 	*/
-				 /* say half that, collisions may be an	*/
-				 /* issue because we blacklist 		*/
-				 /* addresses outside the heap.		*/
-#   endif
-# endif
-# define PHT_ENTRIES ((word)1 << LOG_PHT_ENTRIES)
-# define PHT_SIZE (PHT_ENTRIES >> LOGWL)
-typedef word page_hash_table[PHT_SIZE];
-
-# define PHT_HASH(addr) ((((word)(addr)) >> LOG_HBLKSIZE) & (PHT_ENTRIES - 1))
-
-# define get_pht_entry_from_index(bl, index) \
-		(((bl)[divWORDSZ(index)] >> modWORDSZ(index)) & 1)
-# define set_pht_entry_from_index(bl, index) \
-		(bl)[divWORDSZ(index)] |= (word)1 << modWORDSZ(index)
-# define clear_pht_entry_from_index(bl, index) \
-		(bl)[divWORDSZ(index)] &= ~((word)1 << modWORDSZ(index))
-/* And a dumb but thread-safe version of set_pht_entry_from_index.	*/
-/* This sets (many) extra bits.						*/
-# define set_pht_entry_from_index_safe(bl, index) \
-		(bl)[divWORDSZ(index)] = ONES
-	
-
-
-/********************************************/
-/*                                          */
-/*    H e a p   B l o c k s                 */
-/*                                          */
-/********************************************/
-
-/*  heap block header */
-#define HBLKMASK   (HBLKSIZE-1)
-
-#define BITS_PER_HBLK (CPP_HBLKSIZE * 8)
-
-#define MARK_BITS_PER_HBLK (BITS_PER_HBLK/CPP_WORDSZ)
-	   /* upper bound                                    */
-	   /* We allocate 1 bit/word, unless USE_MARK_BYTES  */
-	   /* is defined.  Only the first word   	     */
-	   /* in each object is actually marked.             */
-
-# ifdef USE_MARK_BYTES
-#   define MARK_BITS_SZ (MARK_BITS_PER_HBLK/2)
-	/* Unlike the other case, this is in units of bytes.		*/
-	/* We actually allocate only every second mark bit, since we	*/
-	/* force all objects to be doubleword aligned.			*/
-	/* However, each mark bit is allocated as a byte.		*/
-# else
-#   define MARK_BITS_SZ (MARK_BITS_PER_HBLK/CPP_WORDSZ)
-# endif
-
-/* We maintain layout maps for heap blocks containing objects of a given */
-/* size.  Each entry in this map describes a byte offset and has the	 */
-/* following type.							 */
-typedef unsigned char map_entry_type;
-
-struct hblkhdr {
-    word hb_sz;  /* If in use, size in words, of objects in the block. */
-		 /* if free, the size in bytes of the whole block      */
-    struct hblk * hb_next; 	/* Link field for hblk free list	 */
-    				/* and for lists of chunks waiting to be */
-    				/* reclaimed.				 */
-    struct hblk * hb_prev;	/* Backwards link for free list.	*/
-    word hb_descr;   		/* object descriptor for marking.  See	*/
-    				/* mark.h.				*/
-    map_entry_type * hb_map;	
-    			/* A pointer to a pointer validity map of the block. */
-    		      	/* See GC_obj_map.				     */
-    		     	/* Valid for all blocks with headers.		     */
-    		     	/* Free blocks point to GC_invalid_map.		     */
-    unsigned char hb_obj_kind;
-    			 /* Kind of objects in the block.  Each kind 	*/
-    			 /* identifies a mark procedure and a set of 	*/
-    			 /* list headers.  Sometimes called regions.	*/
-    unsigned char hb_flags;
-#	define IGNORE_OFF_PAGE	1	/* Ignore pointers that do not	*/
-					/* point to the first page of 	*/
-					/* this object.			*/
-#	define WAS_UNMAPPED 2	/* This is a free block, which has	*/
-				/* been unmapped from the address 	*/
-				/* space.				*/
-				/* GC_remap must be invoked on it	*/
-				/* before it can be reallocated.	*/
-				/* Only set with USE_MUNMAP.		*/
-    unsigned short hb_last_reclaimed;
-    				/* Value of GC_gc_no when block was	*/
-    				/* last allocated or swept. May wrap.   */
-				/* For a free block, this is maintained */
-				/* only for USE_MUNMAP, and indicates	*/
-				/* when the header was allocated, or	*/
-				/* when the size of the block last	*/
-				/* changed.				*/
-#   ifdef USE_MARK_BYTES
-      union {
-        char _hb_marks[MARK_BITS_SZ];
-			    /* The i'th byte is 1 if the object 	*/
-			    /* starting at word 2i is marked, 0 o.w.	*/
-	word dummy;	/* Force word alignment of mark bytes. */
-      } _mark_byte_union;
-#     define hb_marks _mark_byte_union._hb_marks
-#   else
-      word hb_marks[MARK_BITS_SZ];
-			    /* Bit i in the array refers to the             */
-			    /* object starting at the ith word (header      */
-			    /* INCLUDED) in the heap block.                 */
-			    /* The lsb of word 0 is numbered 0.		    */
-			    /* Unused bits are invalid, and are 	    */
-			    /* occasionally set, e.g for uncollectable	    */
-			    /* objects.					    */
-#   endif /* !USE_MARK_BYTES */
-};
-
-/*  heap block body */
-
-# define BODY_SZ (HBLKSIZE/sizeof(word))
-
-struct hblk {
-    word hb_body[BODY_SZ];
-};
-
-# define HBLK_IS_FREE(hdr) ((hdr) -> hb_map == GC_invalid_map)
-
-# define OBJ_SZ_TO_BLOCKS(sz) \
-    divHBLKSZ(WORDS_TO_BYTES(sz) + HBLKSIZE-1)
-    /* Size of block (in units of HBLKSIZE) needed to hold objects of	*/
-    /* given sz (in words).						*/
-
-/* Object free list link */
-# define obj_link(p) (*(ptr_t *)(p))
-
-# define LOG_MAX_MARK_PROCS 6
-# define MAX_MARK_PROCS (1 << LOG_MAX_MARK_PROCS)
-
-/* Root sets.  Logically private to mark_rts.c.  But we don't want the	*/
-/* tables scanned, so we put them here.					*/
-/* MAX_ROOT_SETS is the maximum number of ranges that can be 	*/
-/* registered as static roots. 					*/
-# ifdef LARGE_CONFIG
-#   define MAX_ROOT_SETS 4096
-# else
-    /* GCJ LOCAL: MAX_ROOT_SETS increased to permit more shared */
-    /* libraries to be loaded.                                  */ 
-#   define MAX_ROOT_SETS 1024
-# endif
-
-# define MAX_EXCLUSIONS (MAX_ROOT_SETS/4)
-/* Maximum number of segments that can be excluded from root sets.	*/
-
-/*
- * Data structure for excluded static roots.
- */
-struct exclusion {
-    ptr_t e_start;
-    ptr_t e_end;
-};
-
-/* Data structure for list of root sets.				*/
-/* We keep a hash table, so that we can filter out duplicate additions.	*/
-/* Under Win32, we need to do a better job of filtering overlaps, so	*/
-/* we resort to sequential search, and pay the price.			*/
-struct roots {
-	ptr_t r_start;
-	ptr_t r_end;
-#	if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-	  struct roots * r_next;
-#	endif
-	GC_bool r_tmp;
-	  	/* Delete before registering new dynamic libraries */
-};
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-    /* Size of hash table index to roots.	*/
-#   define LOG_RT_SIZE 6
-#   define RT_SIZE (1 << LOG_RT_SIZE) /* Power of 2, may be != MAX_ROOT_SETS */
-#endif
-
-/* Lists of all heap blocks and free lists	*/
-/* as well as other random data structures	*/
-/* that should not be scanned by the		*/
-/* collector.					*/
-/* These are grouped together in a struct	*/
-/* so that they can be easily skipped by the	*/
-/* GC_mark routine.				*/
-/* The ordering is weird to make GC_malloc	*/
-/* faster by keeping the important fields	*/
-/* sufficiently close together that a		*/
-/* single load of a base register will do.	*/
-/* Scalars that could easily appear to		*/
-/* be pointers are also put here.		*/
-/* The main fields should precede any 		*/
-/* conditionally included fields, so that	*/
-/* gc_inl.h will work even if a different set	*/
-/* of macros is defined when the client is	*/
-/* compiled.					*/
-
-struct _GC_arrays {
-  word _heapsize;
-  word _max_heapsize;
-  word _requested_heapsize;	/* Heap size due to explicit expansion */
-  ptr_t _last_heap_addr;
-  ptr_t _prev_heap_addr;
-  word _large_free_bytes;
-	/* Total bytes contained in blocks on large object free */
-	/* list.						*/
-  word _large_allocd_bytes;
-  	/* Total number of bytes in allocated large objects blocks.	*/
-  	/* For the purposes of this counter and the next one only, a 	*/
-  	/* large object is one that occupies a block of at least	*/
-  	/* 2*HBLKSIZE.							*/
-  word _max_large_allocd_bytes;
-  	/* Maximum number of bytes that were ever allocated in		*/
-  	/* large object blocks.  This is used to help decide when it	*/
-  	/* is safe to split up a large block.				*/
-  word _words_allocd_before_gc;
-		/* Number of words allocated before this	*/
-		/* collection cycle.				*/
-# ifndef SEPARATE_GLOBALS
-    word _words_allocd;
-  	/* Number of words allocated during this collection cycle */
-# endif
-  word _words_wasted;
-  	/* Number of words wasted due to internal fragmentation	*/
-  	/* in large objects, or due to dropping blacklisted     */
-	/* blocks, since last gc.  Approximate.                 */
-  word _words_finalized;
-  	/* Approximate number of words in objects (and headers)	*/
-  	/* That became ready for finalization in the last 	*/
-  	/* collection.						*/
-  word _non_gc_bytes_at_gc;
-  	/* Number of explicitly managed bytes of storage 	*/
-  	/* at last collection.					*/
-  word _mem_freed;
-  	/* Number of explicitly deallocated words of memory	*/
-  	/* since last collection.				*/
-  word _finalizer_mem_freed;
-  	/* Words of memory explicitly deallocated while 	*/
-  	/* finalizers were running.  Used to approximate mem.	*/
-  	/* explicitly deallocated by finalizers.		*/
-  ptr_t _scratch_end_ptr;
-  ptr_t _scratch_last_end_ptr;
-	/* Used by headers.c, and can easily appear to point to	*/
-	/* heap.						*/
-  GC_mark_proc _mark_procs[MAX_MARK_PROCS];
-  	/* Table of user-defined mark procedures.  There is	*/
-	/* a small number of these, which can be referenced	*/
-	/* by DS_PROC mark descriptors.  See gc_mark.h.		*/
-
-# ifndef SEPARATE_GLOBALS
-    ptr_t _objfreelist[MAXOBJSZ+1];
-			  /* free list for objects */
-    ptr_t _aobjfreelist[MAXOBJSZ+1];
-			  /* free list for atomic objs 	*/
-# endif
-
-  ptr_t _uobjfreelist[MAXOBJSZ+1];
-			  /* uncollectable but traced objs 	*/
-			  /* objects on this and auobjfreelist  */
-			  /* are always marked, except during   */
-			  /* garbage collections.		*/
-# ifdef ATOMIC_UNCOLLECTABLE
-    ptr_t _auobjfreelist[MAXOBJSZ+1];
-# endif
-			  /* uncollectable but traced objs 	*/
-
-# ifdef GATHERSTATS
-    word _composite_in_use;
-   		/* Number of words in accessible composite	*/
-		/* objects.					*/
-    word _atomic_in_use;
-   		/* Number of words in accessible atomic		*/
-		/* objects.					*/
-# endif
-# ifdef USE_MUNMAP
-    word _unmapped_bytes;
-# endif
-# ifdef MERGE_SIZES
-    unsigned _size_map[WORDS_TO_BYTES(MAXOBJSZ+1)];
-    	/* Number of words to allocate for a given allocation request in */
-    	/* bytes.							 */
-# endif 
-
-# ifdef STUBBORN_ALLOC
-    ptr_t _sobjfreelist[MAXOBJSZ+1];
-# endif
-  			  /* free list for immutable objects	*/
-  map_entry_type * _obj_map[MAXOBJSZ+1];
-                       /* If not NIL, then a pointer to a map of valid  */
-    		       /* object addresses. _obj_map[sz][i] is j if the	*/
-    		       /* address block_start+i is a valid pointer      */
-    		       /* to an object at block_start +			*/
- 		       /* WORDS_TO_BYTES(BYTES_TO_WORDS(i) - j)		*/
-  		       /* I.e. j is a word displacement from the	*/
-  		       /* object beginning.				*/
-  		       /* The entry is OBJ_INVALID if the corresponding	*/
-  		       /* address is not a valid pointer.  It is 	*/
-  		       /* OFFSET_TOO_BIG if the value j would be too 	*/
-  		       /* large to fit in the entry.  (Note that the	*/
-  		       /* size of these entries matters, both for 	*/
-  		       /* space consumption and for cache utilization.)	*/
-#   define OFFSET_TOO_BIG 0xfe
-#   define OBJ_INVALID 0xff
-#   define MAP_ENTRY(map, bytes) (map)[bytes]
-#   define MAP_ENTRIES HBLKSIZE
-#   define MAP_SIZE MAP_ENTRIES
-#   define CPP_MAX_OFFSET (OFFSET_TOO_BIG - 1)	
-#   define MAX_OFFSET ((word)CPP_MAX_OFFSET)
-    /* The following are used only if GC_all_interior_ptrs != 0 */
-# 	define VALID_OFFSET_SZ \
-	  (CPP_MAX_OFFSET > WORDS_TO_BYTES(CPP_MAXOBJSZ)? \
-	   CPP_MAX_OFFSET+1 \
-	   : WORDS_TO_BYTES(CPP_MAXOBJSZ)+1)
-  	char _valid_offsets[VALID_OFFSET_SZ];
-				/* GC_valid_offsets[i] == TRUE ==> i 	*/
-				/* is registered as a displacement.	*/
-  	char _modws_valid_offsets[sizeof(word)];
-				/* GC_valid_offsets[i] ==>		  */
-				/* GC_modws_valid_offsets[i%sizeof(word)] */
-#   define OFFSET_VALID(displ) \
-	  (GC_all_interior_pointers || GC_valid_offsets[displ])
-# ifdef STUBBORN_ALLOC
-    page_hash_table _changed_pages;
-        /* Stubborn object pages that were changes since last call to	*/
-	/* GC_read_changed.						*/
-    page_hash_table _prev_changed_pages;
-        /* Stubborn object pages that were changes before last call to	*/
-	/* GC_read_changed.						*/
-# endif
-# if defined(PROC_VDB) || defined(MPROTECT_VDB)
-    page_hash_table _grungy_pages; /* Pages that were dirty at last 	   */
-				     /* GC_read_dirty.			   */
-# endif
-# ifdef MPROTECT_VDB
-    VOLATILE page_hash_table _dirty_pages;	
-			/* Pages dirtied since last GC_read_dirty. */
-# endif
-# ifdef PROC_VDB
-    page_hash_table _written_pages;	/* Pages ever dirtied	*/
-# endif
-# ifdef LARGE_CONFIG
-#   if CPP_WORDSZ > 32
-#     define MAX_HEAP_SECTS 4096 	/* overflows at roughly 64 GB	   */
-#   else
-#     define MAX_HEAP_SECTS 768		/* Separately added heap sections. */
-#   endif
-# else
-#   ifdef SMALL_CONFIG
-#     define MAX_HEAP_SECTS 128		/* Roughly 256MB (128*2048*1K)	*/
-#   else
-#     define MAX_HEAP_SECTS 384		/* Roughly 3GB			*/
-#   endif
-# endif
-  struct HeapSect {
-      ptr_t hs_start; word hs_bytes;
-  } _heap_sects[MAX_HEAP_SECTS];
-# if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-    ptr_t _heap_bases[MAX_HEAP_SECTS];
-    		/* Start address of memory regions obtained from kernel. */
-# endif
-# ifdef MSWINCE
-    word _heap_lengths[MAX_HEAP_SECTS];
-    		/* Commited lengths of memory regions obtained from kernel. */
-# endif
-  struct roots _static_roots[MAX_ROOT_SETS];
-# if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-    struct roots * _root_index[RT_SIZE];
-# endif
-  struct exclusion _excl_table[MAX_EXCLUSIONS];
-  /* Block header index; see gc_headers.h */
-  bottom_index * _all_nils;
-  bottom_index * _top_index [TOP_SZ];
-#ifdef SAVE_CALL_CHAIN
-  struct callinfo _last_stack[NFRAMES];	/* Stack at last garbage collection.*/
-  					/* Useful for debugging	mysterious  */
-  					/* object disappearances.	    */
-  					/* In the multithreaded case, we    */
-  					/* currently only save the calling  */
-  					/* stack.			    */
-#endif
-};
-
-GC_API GC_FAR struct _GC_arrays GC_arrays; 
-
-# ifndef SEPARATE_GLOBALS
-#   define GC_objfreelist GC_arrays._objfreelist
-#   define GC_aobjfreelist GC_arrays._aobjfreelist
-#   define GC_words_allocd GC_arrays._words_allocd
-# endif
-# define GC_uobjfreelist GC_arrays._uobjfreelist
-# ifdef ATOMIC_UNCOLLECTABLE
-#   define GC_auobjfreelist GC_arrays._auobjfreelist
-# endif
-# define GC_sobjfreelist GC_arrays._sobjfreelist
-# define GC_valid_offsets GC_arrays._valid_offsets
-# define GC_modws_valid_offsets GC_arrays._modws_valid_offsets
-# ifdef STUBBORN_ALLOC
-#    define GC_changed_pages GC_arrays._changed_pages
-#    define GC_prev_changed_pages GC_arrays._prev_changed_pages
-# endif
-# define GC_obj_map GC_arrays._obj_map
-# define GC_last_heap_addr GC_arrays._last_heap_addr
-# define GC_prev_heap_addr GC_arrays._prev_heap_addr
-# define GC_words_wasted GC_arrays._words_wasted
-# define GC_large_free_bytes GC_arrays._large_free_bytes
-# define GC_large_allocd_bytes GC_arrays._large_allocd_bytes
-# define GC_max_large_allocd_bytes GC_arrays._max_large_allocd_bytes
-# define GC_words_finalized GC_arrays._words_finalized
-# define GC_non_gc_bytes_at_gc GC_arrays._non_gc_bytes_at_gc
-# define GC_mem_freed GC_arrays._mem_freed
-# define GC_finalizer_mem_freed GC_arrays._finalizer_mem_freed
-# define GC_scratch_end_ptr GC_arrays._scratch_end_ptr
-# define GC_scratch_last_end_ptr GC_arrays._scratch_last_end_ptr
-# define GC_mark_procs GC_arrays._mark_procs
-# define GC_heapsize GC_arrays._heapsize
-# define GC_max_heapsize GC_arrays._max_heapsize
-# define GC_requested_heapsize GC_arrays._requested_heapsize
-# define GC_words_allocd_before_gc GC_arrays._words_allocd_before_gc
-# define GC_heap_sects GC_arrays._heap_sects
-# define GC_last_stack GC_arrays._last_stack
-# ifdef USE_MUNMAP
-#   define GC_unmapped_bytes GC_arrays._unmapped_bytes
-# endif
-# if defined(MSWIN32) || defined(MSWINCE) || defined (CYGWIN32)
-#   define GC_heap_bases GC_arrays._heap_bases
-# endif
-# ifdef MSWINCE
-#   define GC_heap_lengths GC_arrays._heap_lengths
-# endif
-# define GC_static_roots GC_arrays._static_roots
-# define GC_root_index GC_arrays._root_index
-# define GC_excl_table GC_arrays._excl_table
-# define GC_all_nils GC_arrays._all_nils
-# define GC_top_index GC_arrays._top_index
-# if defined(PROC_VDB) || defined(MPROTECT_VDB)
-#   define GC_grungy_pages GC_arrays._grungy_pages
-# endif
-# ifdef MPROTECT_VDB
-#   define GC_dirty_pages GC_arrays._dirty_pages
-# endif
-# ifdef PROC_VDB
-#   define GC_written_pages GC_arrays._written_pages
-# endif
-# ifdef GATHERSTATS
-#   define GC_composite_in_use GC_arrays._composite_in_use
-#   define GC_atomic_in_use GC_arrays._atomic_in_use
-# endif
-# ifdef MERGE_SIZES
-#   define GC_size_map GC_arrays._size_map
-# endif
-
-# define beginGC_arrays ((ptr_t)(&GC_arrays))
-# define endGC_arrays (((ptr_t)(&GC_arrays)) + (sizeof GC_arrays))
-
-#define USED_HEAP_SIZE (GC_heapsize - GC_large_free_bytes)
-
-/* Object kinds: */
-# define MAXOBJKINDS 16
-
-extern struct obj_kind {
-   ptr_t *ok_freelist;	/* Array of free listheaders for this kind of object */
-   			/* Point either to GC_arrays or to storage allocated */
-   			/* with GC_scratch_alloc.			     */
-   struct hblk **ok_reclaim_list;
-   			/* List headers for lists of blocks waiting to be */
-   			/* swept.					  */
-   word ok_descriptor;  /* Descriptor template for objects in this	*/
-   			/* block.					*/
-   GC_bool ok_relocate_descr;
-   			/* Add object size in bytes to descriptor 	*/
-   			/* template to obtain descriptor.  Otherwise	*/
-   			/* template is used as is.			*/
-   GC_bool ok_init;   /* Clear objects before putting them on the free list. */
-} GC_obj_kinds[MAXOBJKINDS];
-
-# define beginGC_obj_kinds ((ptr_t)(&GC_obj_kinds))
-# define endGC_obj_kinds (beginGC_obj_kinds + (sizeof GC_obj_kinds))
-
-/* Variables that used to be in GC_arrays, but need to be accessed by 	*/
-/* inline allocation code.  If they were in GC_arrays, the inlined 	*/
-/* allocation code would include GC_arrays offsets (as it did), which	*/
-/* introduce maintenance problems.					*/
-
-#ifdef SEPARATE_GLOBALS
-  word GC_words_allocd;
-  	/* Number of words allocated during this collection cycle */
-  ptr_t GC_objfreelist[MAXOBJSZ+1];
-			  /* free list for NORMAL objects */
-# define beginGC_objfreelist ((ptr_t)(&GC_objfreelist))
-# define endGC_objfreelist (beginGC_objfreelist + sizeof(GC_objfreelist))
-
-  ptr_t GC_aobjfreelist[MAXOBJSZ+1];
-			  /* free list for atomic (PTRFREE) objs 	*/
-# define beginGC_aobjfreelist ((ptr_t)(&GC_aobjfreelist))
-# define endGC_aobjfreelist (beginGC_aobjfreelist + sizeof(GC_aobjfreelist))
-#endif
-
-/* Predefined kinds: */
-# define PTRFREE 0
-# define NORMAL  1
-# define UNCOLLECTABLE 2
-# ifdef ATOMIC_UNCOLLECTABLE
-#   define AUNCOLLECTABLE 3
-#   define STUBBORN 4
-#   define IS_UNCOLLECTABLE(k) (((k) & ~1) == UNCOLLECTABLE)
-# else
-#   define STUBBORN 3
-#   define IS_UNCOLLECTABLE(k) ((k) == UNCOLLECTABLE)
-# endif
-
-extern int GC_n_kinds;
-
-GC_API word GC_fo_entries;
-
-extern word GC_n_heap_sects;	/* Number of separately added heap	*/
-				/* sections.				*/
-
-extern word GC_page_size;
-
-# if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-  struct _SYSTEM_INFO;
-  extern struct _SYSTEM_INFO GC_sysinfo;
-  extern word GC_n_heap_bases;	/* See GC_heap_bases.	*/
-# endif
-
-extern word GC_total_stack_black_listed;
-			/* Number of bytes on stack blacklist. 	*/
-
-extern word GC_black_list_spacing;
-			/* Average number of bytes between blacklisted	*/
-			/* blocks. Approximate.				*/
-			/* Counts only blocks that are 			*/
-			/* "stack-blacklisted", i.e. that are 		*/
-			/* problematic in the interior of an object.	*/
-
-extern map_entry_type * GC_invalid_map;
-			/* Pointer to the nowhere valid hblk map */
-			/* Blocks pointing to this map are free. */
-
-extern struct hblk * GC_hblkfreelist[];
-				/* List of completely empty heap blocks	*/
-				/* Linked through hb_next field of 	*/
-				/* header structure associated with	*/
-				/* block.				*/
-
-extern GC_bool GC_objects_are_marked;	/* There are marked objects in  */
-					/* the heap.			*/
-
-#ifndef SMALL_CONFIG
-  extern GC_bool GC_incremental;
-			/* Using incremental/generational collection. */
-# define TRUE_INCREMENTAL \
-	(GC_incremental && GC_time_limit != GC_TIME_UNLIMITED)
-	/* True incremental, not just generational, mode */
-#else
-# define GC_incremental FALSE
-			/* Hopefully allow optimizer to remove some code. */
-# define TRUE_INCREMENTAL FALSE
-#endif
-
-extern GC_bool GC_dirty_maintained;
-				/* Dirty bits are being maintained, 	*/
-				/* either for incremental collection,	*/
-				/* or to limit the root set.		*/
-
-extern word GC_root_size;	/* Total size of registered root sections */
-
-extern GC_bool GC_debugging_started;	/* GC_debug_malloc has been called. */ 
-
-extern long GC_large_alloc_warn_interval;
-	/* Interval between unsuppressed warnings.	*/
-
-extern long GC_large_alloc_warn_suppressed;
-	/* Number of warnings suppressed so far.	*/
-
-#ifdef THREADS
-  extern GC_bool GC_world_stopped;
-#endif
-
-/* Operations */
-# ifndef abs
-#   define abs(x)  ((x) < 0? (-(x)) : (x))
-# endif
-
-
-/*  Marks are in a reserved area in                          */
-/*  each heap block.  Each word has one mark bit associated  */
-/*  with it. Only those corresponding to the beginning of an */
-/*  object are used.                                         */
-
-/* Set mark bit correctly, even if mark bits may be concurrently 	*/
-/* accessed.								*/
-#ifdef PARALLEL_MARK
-# define OR_WORD(addr, bits) \
-	{ word old; \
-	  do { \
-	    old = *((volatile word *)addr); \
-	  } while (!GC_compare_and_exchange((addr), old, old | (bits))); \
-	}
-# define OR_WORD_EXIT_IF_SET(addr, bits, exit_label) \
-	{ word old; \
-	  word my_bits = (bits); \
-	  do { \
-	    old = *((volatile word *)addr); \
-	    if (old & my_bits) goto exit_label; \
-	  } while (!GC_compare_and_exchange((addr), old, old | my_bits)); \
-	}
-#else
-# define OR_WORD(addr, bits) *(addr) |= (bits)
-# define OR_WORD_EXIT_IF_SET(addr, bits, exit_label) \
-	{ \
-	  word old = *(addr); \
-	  word my_bits = (bits); \
-	  if (old & my_bits) goto exit_label; \
-	  *(addr) = (old | my_bits); \
-	}
-#endif
-
-/* Mark bit operations */
-
-/*
- * Retrieve, set, clear the mark bit corresponding
- * to the nth word in a given heap block.
- *
- * (Recall that bit n corresponds to object beginning at word n
- * relative to the beginning of the block, including unused words)
- */
-
-#ifdef USE_MARK_BYTES
-# define mark_bit_from_hdr(hhdr,n) ((hhdr)->hb_marks[(n) >> 1])
-# define set_mark_bit_from_hdr(hhdr,n) ((hhdr)->hb_marks[(n)>>1]) = 1
-# define clear_mark_bit_from_hdr(hhdr,n) ((hhdr)->hb_marks[(n)>>1]) = 0
-#else /* !USE_MARK_BYTES */
-# define mark_bit_from_hdr(hhdr,n) (((hhdr)->hb_marks[divWORDSZ(n)] \
-			    >> (modWORDSZ(n))) & (word)1)
-# define set_mark_bit_from_hdr(hhdr,n) \
-			    OR_WORD((hhdr)->hb_marks+divWORDSZ(n), \
-				    (word)1 << modWORDSZ(n))
-# define clear_mark_bit_from_hdr(hhdr,n) (hhdr)->hb_marks[divWORDSZ(n)] \
-				&= ~((word)1 << modWORDSZ(n))
-#endif /* !USE_MARK_BYTES */
-
-/* Important internal collector routines */
-
-ptr_t GC_approx_sp GC_PROTO((void));
-  
-GC_bool GC_should_collect GC_PROTO((void));
-  
-void GC_apply_to_all_blocks GC_PROTO(( \
-    void (*fn) GC_PROTO((struct hblk *h, word client_data)), \
-    word client_data));
-  			/* Invoke fn(hbp, client_data) for each 	*/
-  			/* allocated heap block.			*/
-struct hblk * GC_next_used_block GC_PROTO((struct hblk * h));
-  			/* Return first in-use block >= h	*/
-struct hblk * GC_prev_block GC_PROTO((struct hblk * h));
-  			/* Return last block <= h.  Returned block	*/
-  			/* is managed by GC, but may or may not be in	*/
-			/* use.						*/
-void GC_mark_init GC_PROTO((void));
-void GC_clear_marks GC_PROTO((void));	/* Clear mark bits for all heap objects. */
-void GC_invalidate_mark_state GC_PROTO((void));
-					/* Tell the marker that	marked 	   */
-  					/* objects may point to	unmarked   */
-  					/* ones, and roots may point to	   */
-  					/* unmarked objects.		   */
-  					/* Reset mark stack.		   */
-GC_bool GC_mark_stack_empty GC_PROTO((void));
-GC_bool GC_mark_some GC_PROTO((ptr_t cold_gc_frame));
-  			/* Perform about one pages worth of marking	*/
-  			/* work of whatever kind is needed.  Returns	*/
-  			/* quickly if no collection is in progress.	*/
-  			/* Return TRUE if mark phase finished.		*/
-void GC_initiate_gc GC_PROTO((void));
-				/* initiate collection.			*/
-  				/* If the mark state is invalid, this	*/
-  				/* becomes full colleection.  Otherwise */
-  				/* it's partial.			*/
-void GC_push_all GC_PROTO((ptr_t bottom, ptr_t top));
-				/* Push everything in a range 		*/
-  				/* onto mark stack.			*/
-void GC_push_selected GC_PROTO(( \
-    ptr_t bottom, \
-    ptr_t top, \
-    int (*dirty_fn) GC_PROTO((struct hblk *h)), \
-    void (*push_fn) GC_PROTO((ptr_t bottom, ptr_t top)) ));
-				  /* Push all pages h in [b,t) s.t. 	*/
-				  /* select_fn(h) != 0 onto mark stack. */
-#ifndef SMALL_CONFIG
-  void GC_push_conditional GC_PROTO((ptr_t b, ptr_t t, GC_bool all));
-#else
-# define GC_push_conditional(b, t, all) GC_push_all(b, t)
-#endif
-                                /* Do either of the above, depending	*/
-				/* on the third arg.			*/
-void GC_push_all_stack GC_PROTO((ptr_t b, ptr_t t));
-				    /* As above, but consider		*/
-				    /*  interior pointers as valid  	*/
-void GC_push_all_eager GC_PROTO((ptr_t b, ptr_t t));
-				    /* Same as GC_push_all_stack, but   */
-				    /* ensures that stack is scanned	*/
-				    /* immediately, not just scheduled  */
-				    /* for scanning.			*/
-#ifndef THREADS
-  void GC_push_all_stack_partially_eager GC_PROTO(( \
-      ptr_t bottom, ptr_t top, ptr_t cold_gc_frame ));
-			/* Similar to GC_push_all_eager, but only the	*/
-			/* part hotter than cold_gc_frame is scanned	*/
-			/* immediately.  Needed to ensure that callee-	*/
-			/* save registers are not missed.		*/
-#else
-  /* In the threads case, we push part of the current thread stack	*/
-  /* with GC_push_all_eager when we push the registers.  This gets the  */
-  /* callee-save registers that may disappear.  The remainder of the	*/
-  /* stacks are scheduled for scanning in *GC_push_other_roots, which	*/
-  /* is thread-package-specific.					*/
-#endif
-void GC_push_current_stack GC_PROTO((ptr_t cold_gc_frame));
-  			/* Push enough of the current stack eagerly to	*/
-  			/* ensure that callee-save registers saved in	*/
-  			/* GC frames are scanned.			*/
-  			/* In the non-threads case, schedule entire	*/
-  			/* stack for scanning.				*/
-void GC_push_roots GC_PROTO((GC_bool all, ptr_t cold_gc_frame));
-  			/* Push all or dirty roots.	*/
-extern void (*GC_push_other_roots) GC_PROTO((void));
-  			/* Push system or application specific roots	*/
-  			/* onto the mark stack.  In some environments	*/
-  			/* (e.g. threads environments) this is		*/
-  			/* predfined to be non-zero.  A client supplied */
-  			/* replacement should also call the original	*/
-  			/* function.					*/
-extern void GC_push_gc_structures GC_PROTO((void));
-			/* Push GC internal roots.  These are normally	*/
-			/* included in the static data segment, and 	*/
-			/* Thus implicitly pushed.  But we must do this	*/
-			/* explicitly if normal root processing is 	*/
-			/* disabled.  Calls the following:		*/
-	extern void GC_push_finalizer_structures GC_PROTO((void));
-	extern void GC_push_stubborn_structures GC_PROTO((void));
-#	ifdef THREADS
-	  extern void GC_push_thread_structures GC_PROTO((void));
-#	endif
-extern void (*GC_start_call_back) GC_PROTO((void));
-  			/* Called at start of full collections.		*/
-  			/* Not called if 0.  Called with allocation 	*/
-  			/* lock held.					*/
-  			/* 0 by default.				*/
-# if defined(USE_GENERIC_PUSH_REGS)
-  void GC_generic_push_regs GC_PROTO((ptr_t cold_gc_frame));
-# else
-  void GC_push_regs GC_PROTO((void));
-# endif
-# if defined(SPARC) || defined(IA64)
-  /* Cause all stacked registers to be saved in memory.  Return a	*/
-  /* pointer to the top of the corresponding memory stack.		*/
-  word GC_save_regs_in_stack GC_PROTO((void));
-# endif
-			/* Push register contents onto mark stack.	*/
-  			/* If NURSERY is defined, the default push	*/
-  			/* action can be overridden with GC_push_proc	*/
-
-# ifdef NURSERY
-    extern void (*GC_push_proc)(ptr_t);
-# endif
-# if defined(MSWIN32) || defined(MSWINCE)
-  void __cdecl GC_push_one GC_PROTO((word p));
-# else
-  void GC_push_one GC_PROTO((word p));
-			      /* If p points to an object, mark it    */
-                              /* and push contents on the mark stack  */
-  			      /* Pointer recognition test always      */
-  			      /* accepts interior pointers, i.e. this */
-  			      /* is appropriate for pointers found on */
-  			      /* stack.				      */
-# endif
-# if defined(PRINT_BLACK_LIST) || defined(KEEP_BACK_PTRS)
-  void GC_mark_and_push_stack GC_PROTO((word p, ptr_t source));
-				/* Ditto, omits plausibility test	*/
-# else
-  void GC_mark_and_push_stack GC_PROTO((word p));
-# endif
-void GC_push_marked GC_PROTO((struct hblk * h, hdr * hhdr));
-		/* Push contents of all marked objects in h onto	*/
-		/* mark stack.						*/
-#ifdef SMALL_CONFIG
-# define GC_push_next_marked_dirty(h) GC_push_next_marked(h)
-#else
-  struct hblk * GC_push_next_marked_dirty GC_PROTO((struct hblk * h));
-		/* Invoke GC_push_marked on next dirty block above h.	*/
-		/* Return a pointer just past the end of this block.	*/
-#endif /* !SMALL_CONFIG */
-struct hblk * GC_push_next_marked GC_PROTO((struct hblk * h));
-  		/* Ditto, but also mark from clean pages.	*/
-struct hblk * GC_push_next_marked_uncollectable GC_PROTO((struct hblk * h));
-  		/* Ditto, but mark only from uncollectable pages.	*/
-GC_bool GC_stopped_mark GC_PROTO((GC_stop_func stop_func));
- 			/* Stop world and mark from all roots	*/
-  			/* and rescuers.			*/
-void GC_clear_hdr_marks GC_PROTO((hdr * hhdr));
-				    /* Clear the mark bits in a header */
-void GC_set_hdr_marks GC_PROTO((hdr * hhdr));
- 				    /* Set the mark bits in a header */
-void GC_set_fl_marks GC_PROTO((ptr_t p));
-				    /* Set all mark bits associated with */
-				    /* a free list.			 */
-void GC_add_roots_inner GC_PROTO((char * b, char * e, GC_bool tmp));
-void GC_remove_roots_inner GC_PROTO((char * b, char * e));
-GC_bool GC_is_static_root GC_PROTO((ptr_t p));
-  		/* Is the address p in one of the registered static	*/
-  		/* root sections?					*/
-# if defined(MSWIN32) || defined(_WIN32_WCE_EMULATION) || defined(CYGWIN32)
-GC_bool GC_is_tmp_root GC_PROTO((ptr_t p));
-		/* Is the address p in one of the temporary static	*/
-		/* root sections?					*/
-# endif
-void GC_register_dynamic_libraries GC_PROTO((void));
-  		/* Add dynamic library data sections to the root set. */
-
-GC_bool GC_register_main_static_data GC_PROTO((void));
-		/* We need to register the main data segment.  Returns	*/
-		/* TRUE unless this is done implicitly as part of	*/
-		/* dynamic library registration.			*/
-  
-/* Machine dependent startup routines */
-ptr_t GC_get_stack_base GC_PROTO((void));	/* Cold end of stack */
-#ifdef IA64
-  ptr_t GC_get_register_stack_base GC_PROTO((void));
-  					/* Cold end of register stack.	*/
-#endif
-void GC_register_data_segments GC_PROTO((void));
-  
-/* Black listing: */
-void GC_bl_init GC_PROTO((void));
-# ifdef PRINT_BLACK_LIST
-      void GC_add_to_black_list_normal GC_PROTO((word p, ptr_t source));
-			/* Register bits as a possible future false	*/
-			/* reference from the heap or static data	*/
-#     define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \
-      		if (GC_all_interior_pointers) { \
-		  GC_add_to_black_list_stack(bits, (ptr_t)(source)); \
-		} else { \
-  		  GC_add_to_black_list_normal(bits, (ptr_t)(source)); \
-		}
-# else
-      void GC_add_to_black_list_normal GC_PROTO((word p));
-#     define GC_ADD_TO_BLACK_LIST_NORMAL(bits, source) \
-      		if (GC_all_interior_pointers) { \
-		  GC_add_to_black_list_stack(bits); \
-		} else { \
-  		  GC_add_to_black_list_normal(bits); \
-		}
-# endif
-
-# ifdef PRINT_BLACK_LIST
-    void GC_add_to_black_list_stack GC_PROTO((word p, ptr_t source));
-# else
-    void GC_add_to_black_list_stack GC_PROTO((word p));
-# endif
-struct hblk * GC_is_black_listed GC_PROTO((struct hblk * h, word len));
-  			/* If there are likely to be false references	*/
-  			/* to a block starting at h of the indicated    */
-  			/* length, then return the next plausible	*/
-  			/* starting location for h that might avoid	*/
-  			/* these false references.			*/
-void GC_promote_black_lists GC_PROTO((void));
-  			/* Declare an end to a black listing phase.	*/
-void GC_unpromote_black_lists GC_PROTO((void));
-  			/* Approximately undo the effect of the above.	*/
-  			/* This actually loses some information, but	*/
-  			/* only in a reasonably safe way.		*/
-word GC_number_stack_black_listed GC_PROTO(( \
-	struct hblk *start, struct hblk *endp1));
-  			/* Return the number of (stack) blacklisted	*/
-  			/* blocks in the range for statistical		*/
-  			/* purposes.					*/
-  		 	
-ptr_t GC_scratch_alloc GC_PROTO((word bytes));
-  				/* GC internal memory allocation for	*/
-  				/* small objects.  Deallocation is not  */
-  				/* possible.				*/
-  	
-/* Heap block layout maps: */			
-void GC_invalidate_map GC_PROTO((hdr * hhdr));
-  				/* Remove the object map associated	*/
-  				/* with the block.  This identifies	*/
-  				/* the block as invalid to the mark	*/
-  				/* routines.				*/
-GC_bool GC_add_map_entry GC_PROTO((word sz));
-  				/* Add a heap block map for objects of	*/
-  				/* size sz to obj_map.			*/
-  				/* Return FALSE on failure.		*/
-void GC_register_displacement_inner GC_PROTO((word offset));
-  				/* Version of GC_register_displacement	*/
-  				/* that assumes lock is already held	*/
-  				/* and signals are already disabled.	*/
-  
-/*  hblk allocation: */		
-void GC_new_hblk GC_PROTO((word size_in_words, int kind));
-  				/* Allocate a new heap block, and build */
-  				/* a free list in it.			*/				
-
-ptr_t GC_build_fl GC_PROTO((struct hblk *h, word sz,
-			   GC_bool clear,  ptr_t list));
-				/* Build a free list for objects of 	*/
-				/* size sz in block h.  Append list to	*/
-				/* end of the free lists.  Possibly	*/
-				/* clear objects on the list.  Normally	*/
-				/* called by GC_new_hblk, but also	*/
-				/* called explicitly without GC lock.	*/
-
-struct hblk * GC_allochblk GC_PROTO(( \
-	word size_in_words, int kind, unsigned flags));
-				/* Allocate a heap block, inform	*/
-				/* the marker that block is valid	*/
-				/* for objects of indicated size.	*/
-
-ptr_t GC_alloc_large GC_PROTO((word lw, int k, unsigned flags));
-			/* Allocate a large block of size lw words.	*/
-			/* The block is not cleared.			*/
-			/* Flags is 0 or IGNORE_OFF_PAGE.		*/
-			/* Calls GC_allchblk to do the actual 		*/
-			/* allocation, but also triggers GC and/or	*/
-			/* heap expansion as appropriate.		*/
-			/* Does not update GC_words_allocd, but does	*/
-			/* other accounting.				*/
-
-ptr_t GC_alloc_large_and_clear GC_PROTO((word lw, int k, unsigned flags));
-			/* As above, but clear block if appropriate	*/
-			/* for kind k.					*/
-
-void GC_freehblk GC_PROTO((struct hblk * p));
-				/* Deallocate a heap block and mark it  */
-  				/* as invalid.				*/
-  				
-/*  Misc GC: */
-void GC_init_inner GC_PROTO((void));
-GC_bool GC_expand_hp_inner GC_PROTO((word n));
-void GC_start_reclaim GC_PROTO((int abort_if_found));
-  				/* Restore unmarked objects to free	*/
-  				/* lists, or (if abort_if_found is	*/
-  				/* TRUE) report them.			*/
-  				/* Sweeping of small object pages is	*/
-  				/* largely deferred.			*/
-void GC_continue_reclaim GC_PROTO((word sz, int kind));
-  				/* Sweep pages of the given size and	*/
-  				/* kind, as long as possible, and	*/
-  				/* as long as the corr. free list is    */
-  				/* empty.				*/
-void GC_reclaim_or_delete_all GC_PROTO((void));
-  				/* Arrange for all reclaim lists to be	*/
-  				/* empty.  Judiciously choose between	*/
-  				/* sweeping and discarding each page.	*/
-GC_bool GC_reclaim_all GC_PROTO((GC_stop_func stop_func, GC_bool ignore_old));
-  				/* Reclaim all blocks.  Abort (in a	*/
-  				/* consistent state) if f returns TRUE. */
-GC_bool GC_block_empty GC_PROTO((hdr * hhdr));
- 				/* Block completely unmarked? 	*/
-GC_bool GC_never_stop_func GC_PROTO((void));
-				/* Returns FALSE.		*/
-GC_bool GC_try_to_collect_inner GC_PROTO((GC_stop_func f));
-
-				/* Collect; caller must have acquired	*/
-				/* lock and disabled signals.		*/
-				/* Collection is aborted if f returns	*/
-				/* TRUE.  Returns TRUE if it completes	*/
-				/* successfully.			*/
-# define GC_gcollect_inner() \
-	(void) GC_try_to_collect_inner(GC_never_stop_func)
-void GC_finish_collection GC_PROTO((void));
- 				/* Finish collection.  Mark bits are	*/
-  				/* consistent and lock is still held.	*/
-GC_bool GC_collect_or_expand GC_PROTO(( \
-	word needed_blocks, GC_bool ignore_off_page));
-  				/* Collect or expand heap in an attempt */
-  				/* make the indicated number of free	*/
-  				/* blocks available.  Should be called	*/
-  				/* until the blocks are available or	*/
-  				/* until it fails by returning FALSE.	*/
-
-extern GC_bool GC_is_initialized;	/* GC_init() has been run.	*/
-
-#if defined(MSWIN32) || defined(MSWINCE)
-  void GC_deinit GC_PROTO((void));
-                                /* Free any resources allocated by      */
-                                /* GC_init                              */
-#endif
-
-void GC_collect_a_little_inner GC_PROTO((int n));
-  				/* Do n units worth of garbage 		*/
-  				/* collection work, if appropriate.	*/
-  				/* A unit is an amount appropriate for  */
-  				/* HBLKSIZE bytes of allocation.	*/
-/* ptr_t GC_generic_malloc GC_PROTO((word lb, int k)); */
-  				/* Allocate an object of the given	*/
-  				/* kind.  By default, there are only	*/
-  				/* a few kinds: composite(pointerfree), */
-				/* atomic, uncollectable, etc.		*/
-				/* We claim it's possible for clever	*/
-				/* client code that understands GC	*/
-				/* internals to add more, e.g. to	*/
-				/* communicate object layout info	*/
-				/* to the collector.			*/
-				/* The actual decl is in gc_mark.h.	*/
-ptr_t GC_generic_malloc_ignore_off_page GC_PROTO((size_t b, int k));
-  				/* As above, but pointers past the 	*/
-  				/* first page of the resulting object	*/
-  				/* are ignored.				*/
-ptr_t GC_generic_malloc_inner GC_PROTO((word lb, int k));
-  				/* Ditto, but I already hold lock, etc.	*/
-ptr_t GC_generic_malloc_words_small_inner GC_PROTO((word lw, int k));
-				/* Analogous to the above, but assumes	*/
-				/* a small object size, and bypasses	*/
-				/* MERGE_SIZES mechanism.		*/
-ptr_t GC_generic_malloc_words_small GC_PROTO((size_t lw, int k));
-  				/* As above, but size in units of words */
-  				/* Bypasses MERGE_SIZES.  Assumes	*/
-  				/* words <= MAXOBJSZ.			*/
-ptr_t GC_generic_malloc_inner_ignore_off_page GC_PROTO((size_t lb, int k));
-  				/* Allocate an object, where		*/
-  				/* the client guarantees that there	*/
-  				/* will always be a pointer to the 	*/
-  				/* beginning of the object while the	*/
-  				/* object is live.			*/
-ptr_t GC_allocobj GC_PROTO((word sz, int kind));
-  				/* Make the indicated 			*/
-  				/* free list nonempty, and return its	*/
-  				/* head.				*/
-
-void GC_free_inner(GC_PTR p);
-  
-void GC_init_headers GC_PROTO((void));
-struct hblkhdr * GC_install_header GC_PROTO((struct hblk *h));
-  				/* Install a header for block h.	*/
-  				/* Return 0 on failure, or the header	*/
-  				/* otherwise.				*/
-GC_bool GC_install_counts GC_PROTO((struct hblk * h, word sz));
-  				/* Set up forwarding counts for block	*/
-  				/* h of size sz.			*/
-  				/* Return FALSE on failure.		*/
-void GC_remove_header GC_PROTO((struct hblk * h));
-  				/* Remove the header for block h.	*/
-void GC_remove_counts GC_PROTO((struct hblk * h, word sz));
-  				/* Remove forwarding counts for h.	*/
-hdr * GC_find_header GC_PROTO((ptr_t h)); /* Debugging only.		*/
-  
-void GC_finalize GC_PROTO((void));
- 			/* Perform all indicated finalization actions	*/
-  			/* on unmarked objects.				*/
-  			/* Unreachable finalizable objects are enqueued	*/
-  			/* for processing by GC_invoke_finalizers.	*/
-  			/* Invoked with lock.				*/
-
-void GC_notify_or_invoke_finalizers GC_PROTO((void));
-			/* If GC_finalize_on_demand is not set, invoke	*/
-			/* eligible finalizers. Otherwise:		*/
-			/* Call *GC_finalizer_notifier if there are	*/
-			/* finalizers to be run, and we haven't called	*/
-			/* this procedure yet this GC cycle.		*/
-
-GC_API GC_PTR GC_make_closure GC_PROTO((GC_finalization_proc fn, GC_PTR data));
-GC_API void GC_debug_invoke_finalizer GC_PROTO((GC_PTR obj, GC_PTR data));
-			/* Auxiliary fns to make finalization work	*/
-			/* correctly with displaced pointers introduced	*/
-			/* by the debugging allocators.			*/
-  			
-void GC_add_to_heap GC_PROTO((struct hblk *p, word bytes));
-  			/* Add a HBLKSIZE aligned chunk to the heap.	*/
-  
-void GC_print_obj GC_PROTO((ptr_t p));
-  			/* P points to somewhere inside an object with	*/
-  			/* debugging info.  Print a human readable	*/
-  			/* description of the object to stderr.		*/
-extern void (*GC_check_heap) GC_PROTO((void));
-  			/* Check that all objects in the heap with 	*/
-  			/* debugging info are intact.  			*/
-  			/* Add any that are not to GC_smashed list.	*/
-extern void (*GC_print_all_smashed) GC_PROTO((void));
-			/* Print GC_smashed if it's not empty.		*/
-			/* Clear GC_smashed list.			*/
-extern void GC_print_all_errors GC_PROTO((void));
-			/* Print smashed and leaked objects, if any.	*/
-			/* Clear the lists of such objects.		*/
-extern void (*GC_print_heap_obj) GC_PROTO((ptr_t p));
-  			/* If possible print s followed by a more	*/
-  			/* detailed description of the object 		*/
-  			/* referred to by p.				*/
-#if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
-  void GC_print_address_map GC_PROTO((void));
-  			/* Print an address map of the process.		*/
-#endif
-
-extern GC_bool GC_have_errors;  /* We saw a smashed or leaked object.	*/
-				/* Call error printing routine 		*/
-				/* occasionally.			*/
-extern GC_bool GC_print_stats;	/* Produce at least some logging output	*/
-				/* Set from environment variable.	*/
-
-#ifndef NO_DEBUGGING
-  extern GC_bool GC_dump_regularly;  /* Generate regular debugging dumps. */
-# define COND_DUMP if (GC_dump_regularly) GC_dump();
-#else
-# define COND_DUMP
-#endif
-
-#ifdef KEEP_BACK_PTRS
-  extern long GC_backtraces;
-  void GC_generate_random_backtrace_no_gc(void);
-#endif
-
-extern GC_bool GC_print_back_height;
-
-#ifdef MAKE_BACK_GRAPH
-  void GC_print_back_graph_stats(void);
-#endif
-
-/* Macros used for collector internal allocation.	*/
-/* These assume the collector lock is held.		*/
-#ifdef DBG_HDRS_ALL
-    extern GC_PTR GC_debug_generic_malloc_inner(size_t lb, int k);
-    extern GC_PTR GC_debug_generic_malloc_inner_ignore_off_page(size_t lb,
-								int k);
-#   define GC_INTERNAL_MALLOC GC_debug_generic_malloc_inner
-#   define GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE \
-		 GC_debug_generic_malloc_inner_ignore_off_page
-#   ifdef THREADS
-#       define GC_INTERNAL_FREE GC_debug_free_inner
-#   else
-#       define GC_INTERNAL_FREE GC_debug_free
-#   endif
-#else
-#   define GC_INTERNAL_MALLOC GC_generic_malloc_inner
-#   define GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE \
-		 GC_generic_malloc_inner_ignore_off_page
-#   ifdef THREADS
-#       define GC_INTERNAL_FREE GC_free_inner
-#   else
-#       define GC_INTERNAL_FREE GC_free
-#   endif
-#endif
-
-/* Memory unmapping: */
-#ifdef USE_MUNMAP
-  void GC_unmap_old(void);
-  void GC_merge_unmapped(void);
-  void GC_unmap(ptr_t start, word bytes);
-  void GC_remap(ptr_t start, word bytes);
-  void GC_unmap_gap(ptr_t start1, word bytes1, ptr_t start2, word bytes2);
-#endif
-
-/* Virtual dirty bit implementation:		*/
-/* Each implementation exports the following:	*/
-void GC_read_dirty GC_PROTO((void));
-			/* Retrieve dirty bits.	*/
-GC_bool GC_page_was_dirty GC_PROTO((struct hblk *h));
-  			/* Read retrieved dirty bits.	*/
-GC_bool GC_page_was_ever_dirty GC_PROTO((struct hblk *h));
-  			/* Could the page contain valid heap pointers?	*/
-void GC_is_fresh GC_PROTO((struct hblk *h, word n));
-  			/* Assert the region currently contains no	*/
-  			/* valid pointers.				*/
-void GC_remove_protection GC_PROTO((struct hblk *h, word nblocks,
-			   	    GC_bool pointerfree));
-  			/* h is about to be writteni or allocated.  Ensure  */
-			/* that it's not write protected by the virtual	    */
-			/* dirty bit implementation.			    */
-			
-void GC_dirty_init GC_PROTO((void));
-  
-/* Slow/general mark bit manipulation: */
-GC_API GC_bool GC_is_marked GC_PROTO((ptr_t p));
-void GC_clear_mark_bit GC_PROTO((ptr_t p));
-void GC_set_mark_bit GC_PROTO((ptr_t p));
-  
-/* Stubborn objects: */
-void GC_read_changed GC_PROTO((void));	/* Analogous to GC_read_dirty */
-GC_bool GC_page_was_changed GC_PROTO((struct hblk * h));
- 				/* Analogous to GC_page_was_dirty */
-void GC_clean_changing_list GC_PROTO((void));
- 				/* Collect obsolete changing list entries */
-void GC_stubborn_init GC_PROTO((void));
-  
-/* Debugging print routines: */
-void GC_print_block_list GC_PROTO((void));
-void GC_print_hblkfreelist GC_PROTO((void));
-void GC_print_heap_sects GC_PROTO((void));
-void GC_print_static_roots GC_PROTO((void));
-void GC_print_finalization_stats GC_PROTO((void));
-void GC_dump GC_PROTO((void));
-
-#ifdef KEEP_BACK_PTRS
-   void GC_store_back_pointer(ptr_t source, ptr_t dest);
-   void GC_marked_for_finalization(ptr_t dest);
-#  define GC_STORE_BACK_PTR(source, dest) GC_store_back_pointer(source, dest)
-#  define GC_MARKED_FOR_FINALIZATION(dest) GC_marked_for_finalization(dest)
-#else
-#  define GC_STORE_BACK_PTR(source, dest) 
-#  define GC_MARKED_FOR_FINALIZATION(dest)
-#endif
-
-/* Make arguments appear live to compiler */
-# ifdef __WATCOMC__
-    void GC_noop(void*, ...);
-# else
-#   ifdef __DMC__
-      GC_API void GC_noop(...);
-#   else
-      GC_API void GC_noop();
-#   endif
-# endif
-
-void GC_noop1 GC_PROTO((word));
-
-/* Logging and diagnostic output: 	*/
-GC_API void GC_printf GC_PROTO((GC_CONST char * format, long, long, long, long, long, long));
-			/* A version of printf that doesn't allocate,	*/
-			/* is restricted to long arguments, and		*/
-			/* (unfortunately) doesn't use varargs for	*/
-			/* portability.  Restricted to 6 args and	*/
-			/* 1K total output length.			*/
-			/* (We use sprintf.  Hopefully that doesn't	*/
-			/* allocate for long arguments.)  		*/
-# define GC_printf0(f) GC_printf(f, 0l, 0l, 0l, 0l, 0l, 0l)
-# define GC_printf1(f,a) GC_printf(f, (long)a, 0l, 0l, 0l, 0l, 0l)
-# define GC_printf2(f,a,b) GC_printf(f, (long)a, (long)b, 0l, 0l, 0l, 0l)
-# define GC_printf3(f,a,b,c) GC_printf(f, (long)a, (long)b, (long)c, 0l, 0l, 0l)
-# define GC_printf4(f,a,b,c,d) GC_printf(f, (long)a, (long)b, (long)c, \
-					    (long)d, 0l, 0l)
-# define GC_printf5(f,a,b,c,d,e) GC_printf(f, (long)a, (long)b, (long)c, \
-					      (long)d, (long)e, 0l)
-# define GC_printf6(f,a,b,c,d,e,g) GC_printf(f, (long)a, (long)b, (long)c, \
-						(long)d, (long)e, (long)g)
-
-GC_API void GC_err_printf GC_PROTO((GC_CONST char * format, long, long, long, long, long, long));
-# define GC_err_printf0(f) GC_err_puts(f)
-# define GC_err_printf1(f,a) GC_err_printf(f, (long)a, 0l, 0l, 0l, 0l, 0l)
-# define GC_err_printf2(f,a,b) GC_err_printf(f, (long)a, (long)b, 0l, 0l, 0l, 0l)
-# define GC_err_printf3(f,a,b,c) GC_err_printf(f, (long)a, (long)b, (long)c, \
-						  0l, 0l, 0l)
-# define GC_err_printf4(f,a,b,c,d) GC_err_printf(f, (long)a, (long)b, \
-						    (long)c, (long)d, 0l, 0l)
-# define GC_err_printf5(f,a,b,c,d,e) GC_err_printf(f, (long)a, (long)b, \
-						      (long)c, (long)d, \
-						      (long)e, 0l)
-# define GC_err_printf6(f,a,b,c,d,e,g) GC_err_printf(f, (long)a, (long)b, \
-							(long)c, (long)d, \
-							(long)e, (long)g)
-			/* Ditto, writes to stderr.			*/
-			
-void GC_err_puts GC_PROTO((GC_CONST char *s));
-			/* Write s to stderr, don't buffer, don't add	*/
-			/* newlines, don't ...				*/
-
-#if defined(LINUX) && !defined(SMALL_CONFIG)
-  void GC_err_write GC_PROTO((GC_CONST char *buf, size_t len));
- 			/* Write buf to stderr, don't buffer, don't add	*/
-  			/* newlines, don't ...				*/
-#endif
-
-
-# ifdef GC_ASSERTIONS
-#	define GC_ASSERT(expr) if(!(expr)) {\
-		GC_err_printf2("Assertion failure: %s:%ld\n", \
-				__FILE__, (unsigned long)__LINE__); \
-		ABORT("assertion failure"); }
-# else 
-#	define GC_ASSERT(expr)
-# endif
-
-/* Check a compile time assertion at compile time.  The error	*/
-/* message for failure is a bit baroque, but ...		*/
-#if defined(mips) && !defined(__GNUC__)
-/* DOB: MIPSPro C gets an internal error taking the sizeof an array type. 
-   This code works correctly (ugliness is to avoid "unused var" warnings) */
-# define GC_STATIC_ASSERT(expr) do { if (0) { char j[(expr)? 1 : -1]; j[0]='\0'; j[0]=j[0]; } } while(0)
-#else
-# define GC_STATIC_ASSERT(expr) sizeof(char[(expr)? 1 : -1])
-#endif
-
-# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-    /* We need additional synchronization facilities from the thread	*/
-    /* support.  We believe these are less performance critical		*/
-    /* than the main garbage collector lock; standard pthreads-based	*/
-    /* implementations should be sufficient.				*/
-
-    /* The mark lock and condition variable.  If the GC lock is also 	*/
-    /* acquired, the GC lock must be acquired first.  The mark lock is	*/
-    /* used to both protect some variables used by the parallel		*/
-    /* marker, and to protect GC_fl_builder_count, below.		*/
-    /* GC_notify_all_marker() is called when				*/ 
-    /* the state of the parallel marker changes				*/
-    /* in some significant way (see gc_mark.h for details).  The	*/
-    /* latter set of events includes incrementing GC_mark_no.		*/
-    /* GC_notify_all_builder() is called when GC_fl_builder_count	*/
-    /* reaches 0.							*/
-
-     extern void GC_acquire_mark_lock();
-     extern void GC_release_mark_lock();
-     extern void GC_notify_all_builder();
-     /* extern void GC_wait_builder(); */
-     extern void GC_wait_for_reclaim();
-
-     extern word GC_fl_builder_count;	/* Protected by mark lock.	*/
-# endif /* PARALLEL_MARK || THREAD_LOCAL_ALLOC */
-# ifdef PARALLEL_MARK
-     extern void GC_notify_all_marker();
-     extern void GC_wait_marker();
-     extern word GC_mark_no;		/* Protected by mark lock.	*/
-
-     extern void GC_help_marker(word my_mark_no);
-		/* Try to help out parallel marker for mark cycle 	*/
-		/* my_mark_no.  Returns if the mark cycle finishes or	*/
-		/* was already done, or there was nothing to do for	*/
-		/* some other reason.					*/
-# endif /* PARALLEL_MARK */
-
-# if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS)
-  /* We define the thread suspension signal here, so that we can refer	*/
-  /* to it in the dirty bit implementation, if necessary.  Ideally we	*/
-  /* would allocate a (real-time ?) signal using the standard mechanism.*/
-  /* unfortunately, there is no standard mechanism.  (There is one 	*/
-  /* in Linux glibc, but it's not exported.)  Thus we continue to use	*/
-  /* the same hard-coded signals we've always used.			*/
-#  if !defined(SIG_SUSPEND)
-#   if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS)
-#    if defined(SPARC) && !defined(SIGPWR)
-       /* SPARC/Linux doesn't properly define SIGPWR in <signal.h>.
-        * It is aliased to SIGLOST in asm/signal.h, though.		*/
-#      define SIG_SUSPEND SIGLOST
-#    else
-       /* Linuxthreads itself uses SIGUSR1 and SIGUSR2.			*/
-#      define SIG_SUSPEND SIGPWR
-#    endif
-#   else  /* !GC_LINUX_THREADS */
-#     if defined(_SIGRTMIN)
-#       define SIG_SUSPEND _SIGRTMIN + 6
-#     else
-#       define SIG_SUSPEND SIGRTMIN + 6
-#     endif       
-#   endif
-#  endif /* !SIG_SUSPEND */
-  
-# endif
-
-# endif /* GC_PRIVATE_H */
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
deleted file mode 100644
index 44b9d7d86c3..00000000000
--- a/boehm-gc/include/private/gcconfig.h
+++ /dev/null
@@ -1,2477 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 2000-2004 Hewlett-Packard Development Company, L.P.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * This header is private to the gc.  It is almost always included from
- * gc_priv.h.  However it is possible to include it by itself if just the
- * configuration macros are needed.  In that
- * case, a few declarations relying on types declared in gc_priv.h will be
- * omitted.
- */
- 
-#ifndef GCCONFIG_H
-
-# define GCCONFIG_H
-
-# ifndef GC_PRIVATE_H
-    /* Fake ptr_t declaration, just to avoid compilation errors.	*/
-    /* This avoids many instances if "ifndef GC_PRIVATE_H" below.	*/
-    typedef struct GC_undefined_struct * ptr_t;
-# endif
-
-/* Machine dependent parameters.  Some tuning parameters can be found	*/
-/* near the top of gc_private.h.					*/
-
-/* Machine specific parts contributed by various people.  See README file. */
-
-/* First a unified test for Linux: */
-# if defined(linux) || defined(__linux__)
-#  ifndef LINUX
-#    define LINUX
-#  endif
-# endif
-
-/* And one for NetBSD: */
-# if defined(__NetBSD__)
-#    define NETBSD
-# endif
-
-/* And one for OpenBSD: */
-# if defined(__OpenBSD__)
-#    define OPENBSD
-# endif
-
-/* And one for FreeBSD: */
-# if ( defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ) && !defined(FREEBSD)
-#    define FREEBSD
-# endif
-
-/* Determine the machine type: */
-#if defined(__aarch64__)
-#    define AARCH64
-#    if !defined(LINUX)
-#      define NOSYS
-#      define mach_type_known
-#    endif
-# endif
-# if defined(__arm__) || defined(__thumb__)
-#    define ARM32
-#    if !defined(LINUX) && !defined(NETBSD)
-#      define NOSYS
-#      define mach_type_known
-#    endif
-# endif
-# if defined(sun) && defined(mc68000)
-#    define M68K
-#    define SUNOS4
-#    define mach_type_known
-# endif
-# if defined(hp9000s300)
-#    define M68K
-#    define HP
-#    define mach_type_known
-# endif
-# if defined(OPENBSD) && defined(m68k)
-#    define M68K
-#    define mach_type_known
-# endif
-# if defined(OPENBSD) && defined(__sparc__)
-#    define SPARC
-#    define mach_type_known
-# endif
-# if defined(NETBSD) && (defined(m68k) || defined(__m68k__))
-#    define M68K
-#    define mach_type_known
-# endif
-# if defined(NETBSD) && defined(__powerpc__)
-#    define POWERPC
-#    define mach_type_known
-# endif
-# if defined(NETBSD) && (defined(__arm32__) || defined(__arm__))
-#    define ARM32
-#    define mach_type_known
-# endif
-# if defined(NETBSD) && defined(__sh__)
-#    define SH
-#    define mach_type_known
-# endif
-# if defined(vax)
-#    define VAX
-#    ifdef ultrix
-#	define ULTRIX
-#    else
-#	define BSD
-#    endif
-#    define mach_type_known
-# endif
-# if defined(__NetBSD__) && defined(__vax__)
-#    define VAX
-#    define mach_type_known
-# endif
-# if defined(mips) || defined(__mips) || defined(_mips)
-#    define MIPS
-#    if defined(nec_ews) || defined(_nec_ews)
-#      define EWS4800
-#    endif
-#    if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD)
-#      if defined(ultrix) || defined(__ultrix)
-#	 define ULTRIX
-#      else
-#	 if defined(_SYSTYPE_SVR4) || defined(SYSTYPE_SVR4) \
-	    || defined(__SYSTYPE_SVR4__)
-#	   define IRIX5   /* or IRIX 6.X */
-#	 else
-#	   define RISCOS  /* or IRIX 4.X */
-#	 endif
-#      endif
-#    endif /* !LINUX */
-#    if defined(__NetBSD__) && defined(__MIPSEL__)
-#      undef ULTRIX
-#    endif
-#    define mach_type_known
-# endif
-# if defined(DGUX) && (defined(i386) || defined(__i386__))
-#    define I386
-#    ifndef _USING_DGUX
-#    define _USING_DGUX
-#    endif
-#    define mach_type_known
-# endif
-# if defined(sequent) && (defined(i386) || defined(__i386__))
-#    define I386
-#    define SEQUENT
-#    define mach_type_known
-# endif
-# if defined(sun) && (defined(i386) || defined(__i386__))
-#    define I386
-#    define SUNOS5
-#    define mach_type_known
-# endif
-# if defined(sun) && defined(__amd64)
-#    define X86_64
-#    define SUNOS5
-#    define mach_type_known
-# endif
-# if (defined(__OS2__) || defined(__EMX__)) && defined(__32BIT__)
-#    define I386
-#    define OS2
-#    define mach_type_known
-# endif
-# if defined(ibm032)
-#   define RT
-#   define mach_type_known
-# endif
-# if defined(sun) && (defined(sparc) || defined(__sparc))
-#   define SPARC
-    /* Test for SunOS 5.x */
-#     include <errno.h>
-#     ifdef ECHRNG
-#       define SUNOS5
-#     else
-#	define SUNOS4
-#     endif
-#   define mach_type_known
-# endif
-# if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
-     && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-#   define SPARC
-#   define DRSNX
-#   define mach_type_known
-# endif
-# if defined(_IBMR2)
-#   define RS6000
-#   define mach_type_known
-# endif
-# if defined(__NetBSD__) && defined(__sparc__)
-#   define SPARC
-#   define mach_type_known
-# endif
-# if defined(_M_XENIX) && defined(_M_SYSV) && defined(_M_I386)
-	/* The above test may need refinement	*/
-#   define I386
-#   if defined(_SCO_ELF)
-#     define SCO_ELF
-#   else
-#     define SCO
-#   endif
-#   define mach_type_known
-# endif
-# if defined(_AUX_SOURCE)
-#   define M68K
-#   define SYSV
-#   define mach_type_known
-# endif
-# if defined(_PA_RISC1_0) || defined(_PA_RISC1_1) || defined(_PA_RISC2_0) \
-     || defined(hppa) || defined(__hppa__)
-#   define HP_PA
-#   if !defined(LINUX) && !defined(HPUX)
-#     define HPUX
-#   endif
-#   define mach_type_known
-# endif
-# if defined(__ia64) && defined(_HPUX_SOURCE)
-#   define IA64
-#   ifndef HPUX
-#     define HPUX
-#   endif
-#   define mach_type_known
-# endif
-# if defined(__BEOS__) && defined(_X86_)
-#    define I386
-#    define BEOS
-#    define mach_type_known
-# endif
-# if defined(LINUX) && (defined(i386) || defined(__i386__))
-#    define I386
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__x86_64__)
-#    define X86_64
-#    define mach_type_known
-# endif
-# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
-#    define IA64
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__aarch64__)
-#    define AARCH64
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__arm__)
-#    define ARM32
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__cris__)
-#    ifndef CRIS
-#	define CRIS
-#    endif
-#    define mach_type_known
-# endif
-# if defined(LINUX) && (defined(powerpc) || defined(__powerpc__) || \
-		        defined(powerpc64) || defined(__powerpc64__))
-#    define POWERPC
-#    define mach_type_known
-# endif
-# if defined(FREEBSD) && (defined(powerpc) || defined(__powerpc__))
-#    define POWERPC
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__mc68000__)
-#    define M68K
-#    define mach_type_known
-# endif
-# if defined(LINUX) && (defined(sparc) || defined(__sparc__))
-#    define SPARC
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__arm__)
-#    define ARM32
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__sh__)
-#    define SH
-#    define mach_type_known
-# endif
-# if defined(LINUX) && defined(__m32r__)
-#    define M32R
-#    define mach_type_known
-# endif
-# if defined(__alpha) || defined(__alpha__)
-#   define ALPHA
-#   if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) && !defined(FREEBSD)
-#     define OSF1	/* a.k.a Digital Unix */
-#   endif
-#   define mach_type_known
-# endif
-# if defined(_AMIGA) && !defined(AMIGA)
-#   define AMIGA
-# endif
-# ifdef AMIGA 
-#   define M68K
-#   define mach_type_known
-# endif
-# if defined(THINK_C) || defined(__MWERKS__) && !defined(__powerc)
-#   define M68K
-#   define MACOS
-#   define mach_type_known
-# endif
-# if defined(__MWERKS__) && defined(__powerc) && !defined(__MACH__)
-#   define POWERPC
-#   define MACOS
-#   define mach_type_known
-# endif
-# if defined(macosx) || (defined(__APPLE__) && defined(__MACH__))
-#   define DARWIN
-#   if defined(__ppc__)  || defined(__ppc64__)
-#    define POWERPC
-#    define mach_type_known
-#   elif defined(__x86_64__)
-#    define X86_64
-#    define mach_type_known
-#   elif defined(__i386__)
-#    define I386
-#    define mach_type_known
-#   endif
-# endif
-# if defined(NeXT) && defined(mc68000)
-#   define M68K
-#   define NEXT
-#   define mach_type_known
-# endif
-# if defined(NeXT) && (defined(i386) || defined(__i386__))
-#   define I386
-#   define NEXT
-#   define mach_type_known
-# endif
-# if defined(__OpenBSD__) && (defined(i386) || defined(__i386__))
-#   define I386
-#   define OPENBSD
-#   define mach_type_known
-# endif
-# if defined(FREEBSD) && (defined(i386) || defined(__i386__))
-#   define I386
-#   define mach_type_known
-# endif
-# if defined(FREEBSD) && defined(__x86_64__)
-#   define X86_64
-#   define mach_type_known
-# endif
-# if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
-#   define I386
-#   define mach_type_known
-# endif
-# if defined(__NetBSD__) && defined(__x86_64__)
-#    define X86_64
-#    define mach_type_known
-# endif
-# if defined(FREEBSD) && defined(__sparc__)
-#    define SPARC
-#    define mach_type_known
-#endif
-# if defined(bsdi) && (defined(i386) || defined(__i386__))
-#    define I386
-#    define BSDI
-#    define mach_type_known
-# endif
-# if !defined(mach_type_known) && defined(__386BSD__)
-#   define I386
-#   define THREE86BSD
-#   define mach_type_known
-# endif
-# if defined(_CX_UX) && defined(_M88K)
-#   define M88K
-#   define CX_UX
-#   define mach_type_known
-# endif
-# if defined(DGUX) && defined(m88k)
-#   define M88K
-    /* DGUX defined */
-#   define mach_type_known
-# endif
-# if defined(_WIN32_WCE)
-    /* SH3, SH4, MIPS already defined for corresponding architectures */
-#   if defined(SH3) || defined(SH4)
-#     define SH
-#   endif
-#   if defined(x86)
-#     define I386
-#   endif
-#   if defined(ARM)
-#     define ARM32
-#   endif
-#   define MSWINCE
-#   define mach_type_known
-# else
-#   if (defined(_MSDOS) || defined(_MSC_VER)) && (_M_IX86 >= 300) \
-        || defined(_WIN32) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
-#     define I386
-#     define MSWIN32	/* or Win32s */
-#     define mach_type_known
-#   endif
-#   if defined(_MSC_VER) && defined(_M_IA64)
-#     define IA64
-#     define MSWIN32	/* Really win64, but we don't treat 64-bit 	*/
-			/* variants as a differnt platform.		*/
-#   endif
-# endif
-# if defined(__DJGPP__)
-#   define I386
-#   ifndef DJGPP
-#     define DJGPP  /* MSDOS running the DJGPP port of GCC */
-#   endif
-#   define mach_type_known
-# endif
-# if defined(__CYGWIN32__) || defined(__CYGWIN__)
-#   define I386
-#   define CYGWIN32
-#   define mach_type_known
-# endif
-# if defined(__MINGW32__)
-#   define I386
-#   define MSWIN32
-#   define mach_type_known
-# endif
-# if defined(__BORLANDC__)
-#   define I386
-#   define MSWIN32
-#   define mach_type_known
-# endif
-# if defined(_UTS) && !defined(mach_type_known)
-#   define S370
-#   define UTS4
-#   define mach_type_known
-# endif
-# if defined(__pj__)
-#   define PJ
-#   define mach_type_known
-# endif
-# if defined(__embedded__) && defined(PPC)
-#   define POWERPC
-#   define NOSYS
-#   define mach_type_known
-# endif
-/* Ivan Demakov */
-# if defined(__WATCOMC__) && defined(__386__)
-#   define I386
-#   if !defined(OS2) && !defined(MSWIN32) && !defined(DOS4GW)
-#     if defined(__OS2__)
-#       define OS2
-#     else
-#       if defined(__WINDOWS_386__) || defined(__NT__)
-#         define MSWIN32
-#       else
-#         define DOS4GW
-#       endif
-#     endif
-#   endif
-#   define mach_type_known
-# endif
-# if defined(__s390__) && defined(LINUX)
-#    define S390
-#    define mach_type_known
-# endif
-# if defined(__GNU__)
-#   if defined(__i386__)
-/* The Debian Hurd running on generic PC */  
-#     define  HURD
-#     define  I386
-#     define  mach_type_known
-#    endif 
-# endif
-
-/* Feel free to add more clauses here */
-
-/* Or manually define the machine type here.  A machine type is 	*/
-/* characterized by the architecture.  Some				*/
-/* machine types are further subdivided by OS.				*/
-/* the macros ULTRIX, RISCOS, and BSD to distinguish.			*/
-/* Note that SGI IRIX is treated identically to RISCOS.			*/
-/* SYSV on an M68K actually means A/UX.					*/
-/* The distinction in these cases is usually the stack starting address */
-# ifndef mach_type_known
-	--> unknown machine type
-# endif
-		    /* Mapping is: M68K       ==> Motorola 680X0	*/
-		    /*		   (SUNOS4,HP,NEXT, and SYSV (A/UX),	*/
-		    /*		   MACOS and AMIGA variants)		*/
-		    /*             I386       ==> Intel 386	 	*/
-		    /*		    (SEQUENT, OS2, SCO, LINUX, NETBSD,	*/
-		    /*		     FREEBSD, THREE86BSD, MSWIN32,	*/
-		    /* 		     BSDI,SUNOS5, NEXT, other variants)	*/
-                    /*             NS32K      ==> Encore Multimax 	*/
-                    /*             MIPS       ==> R2000 or R3000	*/
-                    /*			(RISCOS, ULTRIX variants)	*/
-                    /*		   VAX	      ==> DEC VAX		*/
-                    /*			(BSD, ULTRIX variants)		*/
-                    /*		   RS6000     ==> IBM RS/6000 AIX3.X	*/
-                    /*		   RT	      ==> IBM PC/RT		*/
-                    /*		   HP_PA      ==> HP9000/700 & /800	*/
-                    /*				  HP/UX, LINUX		*/
-		    /*		   SPARC      ==> SPARC	v7/v8/v9	*/
-		    /*			(SUNOS4, SUNOS5, LINUX,		*/
-		    /*			 DRSNX variants)		*/
-		    /* 		   ALPHA      ==> DEC Alpha 		*/
-		    /*			(OSF1 and LINUX variants)	*/
-		    /* 		   M88K       ==> Motorola 88XX0        */
-		    /* 		        (CX_UX and DGUX)		*/
-		    /* 		   S370	      ==> 370-like machine	*/
-		    /* 			running Amdahl UTS4		*/
-                    /*             S390       ==> 390-like machine      */
-		    /*                  running LINUX                   */
-                    /*             AARCH64    ==> ARM AArch64           */
-		    /* 		   ARM32      ==> Intel StrongARM	*/
-		    /* 		   IA64	      ==> Intel IPF		*/
-		    /*				  (e.g. Itanium)	*/
-		    /*			(LINUX and HPUX)	        */
-		    /*		   SH	      ==> Hitachi SuperH	*/
-		    /* 			(LINUX & MSWINCE)		*/
-		    /* 		   X86_64     ==> AMD x86-64		*/
-		    /*		   POWERPC    ==> IBM/Apple PowerPC	*/
-		    /*			(MACOS(<=9),DARWIN(incl.MACOSX),*/
-		    /*			 LINUX, NETBSD, NOSYS variants)	*/
-		    /*			Handles 32 and 64-bit variants.	*/
-		    /* 			AIX should be handled here, but	*/
-		    /*			that's called an RS6000.	*/
-		    /*		   CRIS       ==> Axis Etrax		*/
-		    /*		   M32R	      ==> Renesas M32R		*/
-
-
-/*
- * For each architecture and OS, the following need to be defined:
- *
- * CPP_WORDSZ is a simple integer constant representing the word size.
- * in bits.  We assume byte addressibility, where a byte has 8 bits.
- * We also assume CPP_WORDSZ is either 32 or 64.
- * (We care about the length of pointers, not hardware
- * bus widths.  Thus a 64 bit processor with a C compiler that uses
- * 32 bit pointers should use CPP_WORDSZ of 32, not 64. Default is 32.)
- *
- * MACH_TYPE is a string representation of the machine type.
- * OS_TYPE is analogous for the OS.
- *
- * ALIGNMENT is the largest N, such that
- * all pointer are guaranteed to be aligned on N byte boundaries.
- * defining it to be 1 will always work, but perform poorly.
- *
- * DATASTART is the beginning of the data segment.
- * On some platforms SEARCH_FOR_DATA_START is defined.
- * SEARCH_FOR_DATASTART will cause GC_data_start to
- * be set to an address determined by accessing data backwards from _end
- * until an unmapped page is found.  DATASTART will be defined to be
- * GC_data_start.
- * On UNIX-like systems, the collector will scan the area between DATASTART
- * and DATAEND for root pointers.
- *
- * DATAEND, if not `end' where `end' is defined as ``extern int end[];''.
- * RTH suggests gaining access to linker script synth'd values with
- * this idiom instead of `&end' where `end' is defined as ``extern int end;'' .
- * Otherwise, ``GCC will assume these are in .sdata/.sbss'' and it will, e.g.,
- * cause failures on alpha*-*-* with ``-msmall-data or -fpic'' or mips-*-*
- * without any special options.
- *
- * ALIGN_DOUBLE of GC_malloc should return blocks aligned to twice
- * the pointer size.
- *
- * STACKBOTTOM is the cool end of the stack, which is usually the
- * highest address in the stack.
- * Under PCR or OS/2, we have other ways of finding thread stacks.
- * For each machine, the following should:
- * 1) define STACK_GROWS_UP if the stack grows toward higher addresses, and
- * 2) define exactly one of
- *	STACKBOTTOM (should be defined to be an expression)
- *	LINUX_STACKBOTTOM
- *	HEURISTIC1
- *	HEURISTIC2
- * If STACKBOTTOM is defined, then it's value will be used directly as the
- * stack base.  If LINUX_STACKBOTTOM is defined, then it will be determined
- * with a method appropriate for most Linux systems.  Currently we look
- * first for __libc_stack_end, and if that fails read it from /proc.
- * If either of the last two macros are defined, then STACKBOTTOM is computed
- * during collector startup using one of the following two heuristics:
- * HEURISTIC1:  Take an address inside GC_init's frame, and round it up to
- *		the next multiple of STACK_GRAN.
- * HEURISTIC2:  Take an address inside GC_init's frame, increment it repeatedly
- *		in small steps (decrement if STACK_GROWS_UP), and read the value
- *		at each location.  Remember the value when the first
- *		Segmentation violation or Bus error is signalled.  Round that
- *		to the nearest plausible page boundary, and use that instead
- *		of STACKBOTTOM.
- *
- * Gustavo Rodriguez-Rivera points out that on most (all?) Unix machines,
- * the value of environ is a pointer that can serve as STACKBOTTOM.
- * I expect that HEURISTIC2 can be replaced by this approach, which
- * interferes far less with debugging.  However it has the disadvantage
- * that it's confused by a putenv call before the collector is initialized.
- * This could be dealt with by intercepting putenv ...
- *
- * If no expression for STACKBOTTOM can be found, and neither of the above
- * heuristics are usable, the collector can still be used with all of the above
- * undefined, provided one of the following is done:
- * 1) GC_mark_roots can be changed to somehow mark from the correct stack(s)
- *    without reference to STACKBOTTOM.  This is appropriate for use in
- *    conjunction with thread packages, since there will be multiple stacks.
- *    (Allocating thread stacks in the heap, and treating them as ordinary
- *    heap data objects is also possible as a last resort.  However, this is
- *    likely to introduce significant amounts of excess storage retention
- *    unless the dead parts of the thread stacks are periodically cleared.)
- * 2) Client code may set GC_stackbottom before calling any GC_ routines.
- *    If the author of the client code controls the main program, this is
- *    easily accomplished by introducing a new main program, setting
- *    GC_stackbottom to the address of a local variable, and then calling
- *    the original main program.  The new main program would read something
- *    like:
- *
- *		# include "gc_private.h"
- *
- *		main(argc, argv, envp)
- *		int argc;
- *		char **argv, **envp;
- *		{
- *		    int dummy;
- *
- *		    GC_stackbottom = (ptr_t)(&dummy);
- *		    return(real_main(argc, argv, envp));
- *		}
- *
- *
- * Each architecture may also define the style of virtual dirty bit
- * implementation to be used:
- *   MPROTECT_VDB: Write protect the heap and catch faults.
- *   PROC_VDB: Use the SVR4 /proc primitives to read dirty bits.
- *
- * An architecture may define DYNAMIC_LOADING if dynamic_load.c
- * defined GC_register_dynamic_libraries() for the architecture.
- *
- * An architecture may define PREFETCH(x) to preload the cache with *x.
- * This defaults to a no-op.
- *
- * PREFETCH_FOR_WRITE(x) is used if *x is about to be written.
- *
- * An architecture may also define CLEAR_DOUBLE(x) to be a fast way to
- * clear the two words at GC_malloc-aligned address x.  By default,
- * word stores of 0 are used instead.
- *
- * HEAP_START may be defined as the initial address hint for mmap-based
- * allocation.
- */
-
-/* If we are using a recent version of gcc, we can use __builtin_unwind_init()
- * to push the relevant registers onto the stack.  This generally makes
- * USE_GENERIC_PUSH_REGS the preferred approach for marking from registers.
- */
-# if defined(__GNUC__) && ((__GNUC__ >= 3) || \
-			   (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) \
-		       && !defined(__INTEL_COMPILER) \
- 		       && !defined(__PATHCC__)
-#   define HAVE_BUILTIN_UNWIND_INIT
-# endif
-
-# define STACK_GRAN 0x1000000
-# ifdef M68K
-#   define MACH_TYPE "M68K"
-#   define ALIGNMENT 2
-#   ifdef OPENBSD
-#	define OS_TYPE "OPENBSD"
-#	define HEURISTIC2
-#	ifdef __ELF__
-#	  define DATASTART GC_data_start
-#	  define DYNAMIC_LOADING
-#	else
-	  extern char etext[];
-#	  define DATASTART ((ptr_t)(etext))
-#       endif
-#       define USE_GENERIC_PUSH_REGS
-#   endif
-#   ifdef NETBSD
-#	define OS_TYPE "NETBSD"
-#	define HEURISTIC2
-#	ifdef __ELF__
-#	  define DATASTART GC_data_start
-#	  define DYNAMIC_LOADING
-#	else
-	  extern char etext[];
-#	  define DATASTART ((ptr_t)(etext))
-#       endif
-#	define USE_GENERIC_PUSH_REGS
-#   endif
-#   ifdef LINUX
-#       define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#       define USE_GENERIC_PUSH_REGS
-		/* We never got around to the assembly version. */
-#       define MPROTECT_VDB
-#       ifdef __ELF__
-#            define DYNAMIC_LOADING
-#	     include <features.h>
-#	     if defined(__GLIBC__)&& __GLIBC__>=2
-#              define SEARCH_FOR_DATA_START
-#	     else /* !GLIBC2 */
-               extern char **__environ;
-#              define DATASTART ((ptr_t)(&__environ))
-                             /* hideous kludge: __environ is the first */
-                             /* word in crt0.o, and delimits the start */
-                             /* of the data segment, no matter which   */
-                             /* ld options were passed through.        */
-                             /* We could use _etext instead, but that  */
-                             /* would include .rodata, which may       */
-                             /* contain large read-only data tables    */
-                             /* that we'd rather not scan.             */
-#	     endif /* !GLIBC2 */
-             extern int _end[];
-#            define DATAEND (_end)
-#       else
-             extern int etext[];
-#            define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       endif
-#   endif
-#   ifdef SUNOS4
-#	define OS_TYPE "SUNOS4"
-	extern char etext[];
-#	define DATASTART ((ptr_t)((((word) (etext)) + 0x1ffff) & ~0x1ffff))
-#	define HEURISTIC1	/* differs	*/
-#	define DYNAMIC_LOADING
-#   endif
-#   ifdef HP
-#	define OS_TYPE "HP"
-	extern char etext[];
-#       define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       define STACKBOTTOM ((ptr_t) 0xffeffffc)
-			      /* empirically determined.  seems to work. */
-#  	include <unistd.h>
-#	define GETPAGESIZE() sysconf(_SC_PAGE_SIZE)
-#   endif
-#   ifdef SYSV
-#	define OS_TYPE "SYSV"
-	extern etext[];
-#   	define DATASTART ((ptr_t)((((word) (etext)) + 0x3fffff) \
-				   & ~0x3fffff) \
-				  +((word)etext & 0x1fff))
-	/* This only works for shared-text binaries with magic number 0413.
-	   The other sorts of SysV binaries put the data at the end of the text,
-	   in which case the default of etext would work.  Unfortunately,
-	   handling both would require having the magic-number available.
-	   	   		-- Parag
-	   */
-#	define STACKBOTTOM ((ptr_t)0xFFFFFFFE)
-			/* The stack starts at the top of memory, but   */
-			/* 0x0 cannot be used as setjump_test complains */
-			/* that the stack direction is incorrect.  Two  */
-			/* bytes down from 0x0 should be safe enough.   */
-			/* 		--Parag				*/
-#   	include <sys/mmu.h>
-#	define GETPAGESIZE() PAGESIZE	/* Is this still right? */
-#   endif
-#   ifdef AMIGA
-#	define OS_TYPE "AMIGA"
- 	    	/* STACKBOTTOM and DATASTART handled specially	*/
- 	    	/* in os_dep.c					*/
-# 	define DATAEND	/* not needed */
-#	define GETPAGESIZE() 4096
-#   endif
-#   ifdef MACOS
-#     ifndef __LOWMEM__
-#     include <LowMem.h>
-#     endif
-#     define OS_TYPE "MACOS"
-			/* see os_dep.c for details of global data segments. */
-#     define STACKBOTTOM ((ptr_t) LMGetCurStackBase())
-#     define DATAEND	/* not needed */
-#     define GETPAGESIZE() 4096
-#   endif
-#   ifdef NEXT
-#	define OS_TYPE "NEXT"
-#	define DATASTART ((ptr_t) get_etext())
-#	define STACKBOTTOM ((ptr_t) 0x4000000)
-#	define DATAEND	/* not needed */
-#   endif
-# endif
-
-# if defined(POWERPC)
-#   define MACH_TYPE "POWERPC"
-#   ifdef MACOS
-#     define ALIGNMENT 2  /* Still necessary?  Could it be 4?	*/
-#     ifndef __LOWMEM__
-#     include <LowMem.h>
-#     endif
-#     define OS_TYPE "MACOS"
-			/* see os_dep.c for details of global data segments. */
-#     define STACKBOTTOM ((ptr_t) LMGetCurStackBase())
-#     define DATAEND  /* not needed */
-#   endif
-#   ifdef LINUX
-#     if defined(__powerpc64__)
-#       define ALIGNMENT 8
-#       define CPP_WORDSZ 64
-#       ifndef HBLKSIZE
-#         define HBLKSIZE 4096
-#       endif
-#     else
-#       define ALIGNMENT 4
-#     endif
-#     define OS_TYPE "LINUX"
-      /* HEURISTIC1 has been reliably reported to fail for a 32-bit	*/
-      /* executable on a 64 bit kernel.					*/
-#     define LINUX_STACKBOTTOM
-#     define DYNAMIC_LOADING
-#     define SEARCH_FOR_DATA_START
-      extern int _end[];
-#     define DATAEND (_end)
-#   endif
-#   ifdef DARWIN
-#     define OS_TYPE "DARWIN"
-#     define DYNAMIC_LOADING
-#     if defined(__ppc64__)
-#       define ALIGNMENT 8
-#       define CPP_WORDSZ 64
-#       define STACKBOTTOM ((ptr_t) 0x7fff5fc00000)
-#       define CACHE_LINE_SIZE 64
-#       ifndef HBLKSIZE
-#         define HBLKSIZE 4096
-#       endif
-#     else
-#       define ALIGNMENT 4
-#       define STACKBOTTOM ((ptr_t) 0xc0000000)
-#     endif
-      /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-	 These aren't used when dyld support is enabled (it is by default) */
-#     define DATASTART ((ptr_t) get_etext())
-#     define DATAEND	((ptr_t) get_end())
-#     define USE_MMAP
-#     define USE_MMAP_ANON
-#     define USE_ASM_PUSH_REGS
-#     ifdef GC_DARWIN_THREADS
-#       define MPROTECT_VDB
-#     endif
-#     include <unistd.h>
-#     define GETPAGESIZE() getpagesize()
-#     if defined(USE_PPC_PREFETCH) && defined(__GNUC__)
-	/* The performance impact of prefetches is untested */
-#	define PREFETCH(x) \
-	  __asm__ __volatile__ ("dcbt 0,%0" : : "r" ((const void *) (x)))
-#	define PREFETCH_FOR_WRITE(x) \
-	  __asm__ __volatile__ ("dcbtst 0,%0" : : "r" ((const void *) (x)))
-#     endif
-      /* There seems to be some issues with trylock hanging on darwin. This
-	 should be looked into some more */
-#     define NO_PTHREAD_TRYLOCK
-#   endif
-#   ifdef FREEBSD
-#   if defined(__powerpc64__)
-#       define ALIGNMENT 8
-#       define CPP_WORDSZ 64
-#       ifndef HBLKSIZE
-#           define HBLKSIZE 4096
-#       endif
-#   else
-#       define ALIGNMENT 4
-#   endif
-#       define OS_TYPE "FREEBSD"
-#       ifndef GC_FREEBSD_THREADS
-#           define MPROTECT_VDB
-#       endif
-#       define SIG_SUSPEND SIGUSR1
-#       define SIG_THR_RESTART SIGUSR2
-#       define FREEBSD_STACKBOTTOM
-#       ifdef __ELF__
-#           define DYNAMIC_LOADING
-#       endif
-        extern char etext[];
-        extern char * GC_FreeBSDGetDataStart();
-#       define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-#   endif
-#   ifdef NETBSD
-#     define ALIGNMENT 4
-#     define OS_TYPE "NETBSD"
-#     define HEURISTIC2
-      extern char etext[];
-#     define DATASTART GC_data_start
-#     define DYNAMIC_LOADING
-#   endif
-#   ifdef NOSYS
-#     define ALIGNMENT 4
-#     define OS_TYPE "NOSYS"
-      extern void __end[], __dso_handle[];
-#     define DATASTART (__dso_handle)  /* OK, that's ugly.  */
-#     define DATAEND (__end)
-	/* Stack starts at 0xE0000000 for the simulator.  */
-#     undef STACK_GRAN
-#     define STACK_GRAN 0x10000000
-#     define HEURISTIC1
-#   endif
-# endif
-
-# ifdef VAX
-#   define MACH_TYPE "VAX"
-#   define ALIGNMENT 4	/* Pointers are longword aligned by 4.2 C compiler */
-    extern char etext[];
-#   define DATASTART ((ptr_t)(etext))
-#   ifdef BSD
-#	define OS_TYPE "BSD"
-#	define HEURISTIC1
-			/* HEURISTIC2 may be OK, but it's hard to test. */
-#   endif
-#   ifdef ULTRIX
-#	define OS_TYPE "ULTRIX"
-#	define STACKBOTTOM ((ptr_t) 0x7fffc800)
-#   endif
-# endif
-
-# ifdef RT
-#   define MACH_TYPE "RT"
-#   define ALIGNMENT 4
-#   define DATASTART ((ptr_t) 0x10000000)
-#   define STACKBOTTOM ((ptr_t) 0x1fffd800)
-# endif
-
-# ifdef SPARC
-#   define MACH_TYPE "SPARC"
-#   if defined(__arch64__) || defined(__sparcv9)
-#     define ALIGNMENT 8
-#     define CPP_WORDSZ 64
-#     define ELF_CLASS ELFCLASS64
-#   else
-#     define ALIGNMENT 4	/* Required by hardware	*/
-#     define CPP_WORDSZ 32
-#   endif
-#   define ALIGN_DOUBLE
-#   ifdef SUNOS5
-#	define OS_TYPE "SUNOS5"
-	extern int _etext[];
-	extern int _end[];
-	extern ptr_t GC_SysVGetDataStart();
-#       define DATASTART GC_SysVGetDataStart(0x10000, _etext)
-#	define DATAEND (_end)
-#	if !defined(USE_MMAP) && defined(REDIRECT_MALLOC)
-#	    define USE_MMAP
-	    /* Otherwise we now use calloc.  Mmap may result in the	*/
-	    /* heap interleaved with thread stacks, which can result in	*/
-	    /* excessive blacklisting.  Sbrk is unusable since it	*/
-	    /* doesn't interact correctly with the system malloc.	*/
-#	endif
-#       ifdef USE_MMAP
-#         define HEAP_START (ptr_t)0x40000000
-#       else
-#	  define HEAP_START DATAEND
-#       endif
-#	define PROC_VDB
-#	define SOLARIS_STACKBOTTOM
-#	include <unistd.h>
-#       define GETPAGESIZE()  sysconf(_SC_PAGESIZE)
-		/* getpagesize() appeared to be missing from at least one */
-		/* Solaris 5.4 installation.  Weird.			  */
-#	define DYNAMIC_LOADING
-#   endif
-#   ifdef SUNOS4
-#	define OS_TYPE "SUNOS4"
-	/* [If you have a weak stomach, don't read this.]		*/
-	/* We would like to use:					*/
-/* #       define DATASTART ((ptr_t)((((word) (etext)) + 0x1fff) & ~0x1fff)) */
-	/* This fails occasionally, due to an ancient, but very 	*/
-	/* persistent ld bug.  etext is set 32 bytes too high.		*/
-	/* We instead read the text segment size from the a.out		*/
-	/* header, which happens to be mapped into our address space	*/
-	/* at the start of the text segment.  The detective work here	*/
-	/* was done by Robert Ehrlich, Manuel Serrano, and Bernard	*/
-	/* Serpette of INRIA.						*/
-	/* This assumes ZMAGIC, i.e. demand-loadable executables.	*/
-#	define TEXTSTART 0x2000
-#       define DATASTART ((ptr_t)(*(int *)(TEXTSTART+0x4)+TEXTSTART))
-#	define MPROTECT_VDB
-#	define HEURISTIC1
-# 	define DYNAMIC_LOADING
-#   endif
-#   ifdef DRSNX
-#	define OS_TYPE "DRSNX"
-	extern ptr_t GC_SysVGetDataStart();
-	extern int etext[];
-#       define DATASTART GC_SysVGetDataStart(0x10000, etext)
-#	define MPROTECT_VDB
-#       define STACKBOTTOM ((ptr_t) 0xdfff0000)
-#	define DYNAMIC_LOADING
-#   endif
-#   ifdef LINUX
-#     define OS_TYPE "LINUX"
-#     ifdef __ELF__
-#       define DYNAMIC_LOADING
-#     else
-          Linux Sparc/a.out not supported
-#     endif
-      extern int _end[];
-      extern int _etext[];
-#     define DATAEND (_end)
-#     define SVR4
-      extern ptr_t GC_SysVGetDataStart();
-#     ifdef __arch64__
-#	define DATASTART GC_SysVGetDataStart(0x100000, _etext)
-#     else
-#       define DATASTART GC_SysVGetDataStart(0x10000, _etext)
-#     endif
-#     define LINUX_STACKBOTTOM
-#   endif
-#   ifdef OPENBSD
-#     define OS_TYPE "OPENBSD"
-#     define STACKBOTTOM ((ptr_t) 0xf8000000)
-      extern int etext[];
-#     define DATASTART ((ptr_t)(etext))
-#   endif
-#   ifdef NETBSD
-#     define OS_TYPE "NETBSD"
-#     define HEURISTIC2
-#     ifdef __ELF__
-#	define DATASTART GC_data_start
-#	define DYNAMIC_LOADING
-#     else
-	extern char etext[];
-#	define DATASTART ((ptr_t)(etext))
-#     endif
-#   endif
-#   ifdef FREEBSD
-#	define OS_TYPE "FREEBSD"
-#	define SIG_SUSPEND SIGUSR1
-#	define SIG_THR_RESTART SIGUSR2
-#	define FREEBSD_STACKBOTTOM
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-	extern char etext[];
-	extern char edata[];
-	extern char end[];
-#	define NEED_FIND_LIMIT
-#	define DATASTART ((ptr_t)(&etext))
-#	define DATAEND (GC_find_limit (DATASTART, TRUE))
-#	define DATASTART2 ((ptr_t)(&edata))
-#	define DATAEND2 ((ptr_t)(&end))
-#   endif
-# endif
-
-# ifdef I386
-#   define MACH_TYPE "I386"
-#   if defined(__LP64__) || defined(_WIN64)
-#     define CPP_WORDSZ 64
-#     define ALIGNMENT 8
-#   else
-#     define CPP_WORDSZ 32
-#     define ALIGNMENT 4
-			/* Appears to hold for all "32 bit" compilers	*/
-			/* except Borland.  The -a4 option fixes 	*/
-			/* Borland.					*/
-                        /* Ivan Demakov: For Watcom the option is -zp4. */
-#   endif
-#   ifndef SMALL_CONFIG
-#     define ALIGN_DOUBLE /* Not strictly necessary, but may give speed   */
-			  /* improvement on Pentiums.			  */
-#   endif
-#   ifdef HAVE_BUILTIN_UNWIND_INIT
-#	define USE_GENERIC_PUSH_REGS
-#   endif
-#   ifdef SEQUENT
-#	define OS_TYPE "SEQUENT"
-	extern int etext[];
-#       define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       define STACKBOTTOM ((ptr_t) 0x3ffff000) 
-#   endif
-#   ifdef BEOS
-#     define OS_TYPE "BEOS"
-#     include <OS.h>
-#     define GETPAGESIZE() B_PAGE_SIZE
-      extern int etext[];
-#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#   endif
-#   ifdef SUNOS5
-#	define OS_TYPE "SUNOS5"
-        extern int _etext[], _end[];
-  	extern ptr_t GC_SysVGetDataStart();
-#       define DATASTART GC_SysVGetDataStart(0x1000, _etext)
-#	define DATAEND (_end)
-#	define SOLARIS_STACKBOTTOM
-/* At least in Solaris 2.5, PROC_VDB gives wrong values for dirty bits. */
-/* It appears to be fixed in 2.8 and 2.9.				*/
-#	ifdef SOLARIS25_PROC_VDB_BUG_FIXED
-#	  define PROC_VDB
-#	endif
-#	define DYNAMIC_LOADING
-#	if !defined(USE_MMAP) && defined(REDIRECT_MALLOC)
-#	    define USE_MMAP
-	    /* Otherwise we now use calloc.  Mmap may result in the	*/
-	    /* heap interleaved with thread stacks, which can result in	*/
-	    /* excessive blacklisting.  Sbrk is unusable since it	*/
-	    /* doesn't interact correctly with the system malloc.	*/
-#	endif
-#       ifdef USE_MMAP
-#         define HEAP_START (ptr_t)0x40000000
-#       else
-#	  define HEAP_START DATAEND
-#       endif
-#   endif
-#   ifdef SCO
-#	define OS_TYPE "SCO"
-	extern int etext[];
-#   	define DATASTART ((ptr_t)((((word) (etext)) + 0x3fffff) \
-				  & ~0x3fffff) \
-				 +((word)etext & 0xfff))
-#	define STACKBOTTOM ((ptr_t) 0x7ffffffc)
-#   endif
-#   ifdef SCO_ELF
-#       define OS_TYPE "SCO_ELF"
-        extern int etext[];
-#       define DATASTART ((ptr_t)(etext))
-#       define STACKBOTTOM ((ptr_t) 0x08048000)
-#       define DYNAMIC_LOADING
-#	define ELF_CLASS ELFCLASS32
-#   endif
-#   ifdef DGUX
-#	define OS_TYPE "DGUX"
-	extern int _etext, _end;
-	extern ptr_t GC_SysVGetDataStart();
-#	define DATASTART GC_SysVGetDataStart(0x1000, &_etext)
-#	define DATAEND (&_end)
-#	define STACK_GROWS_DOWN
-#	define HEURISTIC2
-#	include <unistd.h>
-#	define GETPAGESIZE()  sysconf(_SC_PAGESIZE)
-#	define DYNAMIC_LOADING
-#	ifndef USE_MMAP
-#	  define USE_MMAP
-#	endif /* USE_MMAP */
-#	define MAP_FAILED (void *) -1
-#	ifdef USE_MMAP
-#	  define HEAP_START (ptr_t)0x40000000
-#	else /* USE_MMAP */
-#	  define HEAP_START DATAEND
-#	endif /* USE_MMAP */
-#   endif /* DGUX */
-
-#   ifdef LINUX
-#	ifndef __GNUC__
-	  /* The Intel compiler doesn't like inline assembly */
-#	  define USE_GENERIC_PUSH_REGS
-# 	endif
-#	define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#	if 0
-#	  define HEURISTIC1
-#         undef STACK_GRAN
-#         define STACK_GRAN 0x10000000
-	  /* STACKBOTTOM is usually 0xc0000000, but this changes with	*/
-	  /* different kernel configurations.  In particular, systems	*/
-	  /* with 2GB physical memory will usually move the user	*/
-	  /* address space limit, and hence initial SP to 0x80000000.	*/
-#       endif
-#       if !defined(GC_LINUX_THREADS) || !defined(REDIRECT_MALLOC)
-#	    define MPROTECT_VDB
-#	else
-	    /* We seem to get random errors in incremental mode,	*/
-	    /* possibly because Linux threads is itself a malloc client */
-	    /* and can't deal with the signals.				*/
-#	endif
-#	define HEAP_START (ptr_t)0x1000
-		/* This encourages mmap to give us low addresses,	*/
-		/* thus allowing the heap to grow to ~3GB		*/
-#       ifdef __ELF__
-#            define DYNAMIC_LOADING
-#	     ifdef UNDEFINED	/* includes ro data */
-	       extern int _etext[];
-#              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
-#	     endif
-#	     include <features.h>
-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
-#		 define SEARCH_FOR_DATA_START
-#	     else
-     	         extern char **__environ;
-#                define DATASTART ((ptr_t)(&__environ))
-			      /* hideous kludge: __environ is the first */
-			      /* word in crt0.o, and delimits the start */
-			      /* of the data segment, no matter which   */
-			      /* ld options were passed through.        */
-			      /* We could use _etext instead, but that  */
-			      /* would include .rodata, which may       */
-			      /* contain large read-only data tables    */
-			      /* that we'd rather not scan.		*/
-#	     endif
-	     extern int _end[];
-#	     define DATAEND (_end)
-#	else
-	     extern int etext[];
-#            define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       endif
-#	ifdef USE_I686_PREFETCH
-	  /* FIXME: Thus should use __builtin_prefetch, but we'll leave that	*/
-	  /* for the next rtelease.						*/
-#	  define PREFETCH(x) \
-	    __asm__ __volatile__ ("	prefetchnta	%0": : "m"(*(char *)(x)))
-	    /* Empirically prefetcht0 is much more effective at reducing	*/
-	    /* cache miss stalls for the targetted load instructions.  But it	*/
-	    /* seems to interfere enough with other cache traffic that the net	*/
-	    /* result is worse than prefetchnta.				*/
-#         if 0 
-	    /* Using prefetches for write seems to have a slight negative	*/
-	    /* impact on performance, at least for a PIII/500.			*/
-#	    define PREFETCH_FOR_WRITE(x) \
-	      __asm__ __volatile__ ("	prefetcht0	%0": : "m"(*(char *)(x)))
-#	  endif
-#	endif
-#	ifdef USE_3DNOW_PREFETCH
-#	  define PREFETCH(x) \
-	    __asm__ __volatile__ ("	prefetch	%0": : "m"(*(char *)(x)))
-#	  define PREFETCH_FOR_WRITE(x) \
-	    __asm__ __volatile__ ("	prefetchw	%0": : "m"(*(char *)(x)))
-#	endif
-#   endif
-#   ifdef CYGWIN32
-#       define OS_TYPE "CYGWIN32"
-#       define DATASTART ((ptr_t)GC_DATASTART)  /* From gc.h */
-#       define DATAEND	 ((ptr_t)GC_DATAEND)
-#	undef STACK_GRAN
-#       define STACK_GRAN 0x10000
-#       define HEURISTIC1
-#   endif
-#   ifdef OS2
-#	define OS_TYPE "OS2"
- 	    	/* STACKBOTTOM and DATASTART are handled specially in 	*/
-		/* os_dep.c. OS2 actually has the right			*/
-		/* system call!						*/
-#	define DATAEND	/* not needed */
-#	define USE_GENERIC_PUSH_REGS
-#   endif
-#   ifdef MSWIN32
-#	define OS_TYPE "MSWIN32"
-		/* STACKBOTTOM and DATASTART are handled specially in 	*/
-		/* os_dep.c.						*/
-#       ifndef __WATCOMC__
-#	  define MPROTECT_VDB
-#	endif
-#       define DATAEND  /* not needed */
-#   endif
-#   ifdef MSWINCE
-#	define OS_TYPE "MSWINCE"
-#       define DATAEND  /* not needed */
-#   endif
-#   ifdef DJGPP
-#       define OS_TYPE "DJGPP"
-#       include "stubinfo.h"
-        extern int etext[];
-        extern int _stklen;
-        extern int __djgpp_stack_limit;
-#       define DATASTART ((ptr_t)((((word) (etext)) + 0x1ff) & ~0x1ff))
-/* #       define STACKBOTTOM ((ptr_t)((word) _stubinfo + _stubinfo->size \
-                                                     + _stklen)) */
-#       define STACKBOTTOM ((ptr_t)((word) __djgpp_stack_limit + _stklen))
-		/* This may not be right.  */
-#   endif
-#   ifdef OPENBSD
-#	define OS_TYPE "OPENBSD"
-#   endif
-#   ifdef FREEBSD
-#	define OS_TYPE "FREEBSD"
-#	ifndef GC_FREEBSD_THREADS
-#	    define MPROTECT_VDB
-#	endif
-#	ifdef __GLIBC__
-#	    define SIG_SUSPEND		(32+6)
-#	    define SIG_THR_RESTART	(32+5)
-	    extern int _end[];
-#	    define DATAEND (_end)
-#	else
-#	    define SIG_SUSPEND SIGUSR1
-#	    define SIG_THR_RESTART SIGUSR2
-#	endif
-#	define FREEBSD_STACKBOTTOM
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-	extern char etext[];
-	extern char * GC_FreeBSDGetDataStart();
-#	define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-#   endif
-#   ifdef NETBSD
-#	define OS_TYPE "NETBSD"
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-#   endif
-#   ifdef THREE86BSD
-#	define OS_TYPE "THREE86BSD"
-#   endif
-#   ifdef BSDI
-#	define OS_TYPE "BSDI"
-#   endif
-#   if defined(OPENBSD) || defined(NETBSD) \
-        || defined(THREE86BSD) || defined(BSDI)
-#	define HEURISTIC2
-	extern char etext[];
-#	define DATASTART ((ptr_t)(etext))
-#   endif
-#   ifdef NEXT
-#	define OS_TYPE "NEXT"
-#	define DATASTART ((ptr_t) get_etext())
-#	define STACKBOTTOM ((ptr_t)0xc0000000)
-#	define DATAEND	/* not needed */
-#   endif
-#   ifdef DOS4GW
-#     define OS_TYPE "DOS4GW"
-      extern long __nullarea;
-      extern char _end;
-      extern char *_STACKTOP;
-      /* Depending on calling conventions Watcom C either precedes
-         or does not precedes with undescore names of C-variables.
-         Make sure startup code variables always have the same names.  */
-      #pragma aux __nullarea "*";
-      #pragma aux _end "*";
-#     define STACKBOTTOM ((ptr_t) _STACKTOP)
-                         /* confused? me too. */
-#     define DATASTART ((ptr_t) &__nullarea)
-#     define DATAEND ((ptr_t) &_end)
-#   endif
-#   ifdef HURD
-#     define OS_TYPE "HURD"
-#     define STACK_GROWS_DOWN
-#     define HEURISTIC2
-#     define SIG_SUSPEND SIGUSR1
-#     define SIG_THR_RESTART SIGUSR2
-#     define SEARCH_FOR_DATA_START
-      extern int   _end[];
-#     define DATAEND ( (ptr_t) (_end))
-/* #     define MPROTECT_VDB  Not quite working yet? */
-#     define DYNAMIC_LOADING
-#   endif
-#   ifdef DARWIN
-#     define OS_TYPE "DARWIN"
-#     define DARWIN_DONT_PARSE_STACK
-#     define DYNAMIC_LOADING
-      /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-	 These aren't used when dyld support is enabled (it is by default) */
-#     define DATASTART ((ptr_t) get_etext())
-#     define DATAEND	((ptr_t) get_end())
-#     ifdef HAVE_PTHREAD_GET_STACKADDR_NP
-#       define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self())
-#     else
-#       define STACKBOTTOM ((ptr_t) 0xc0000000)
-#     endif
-#     define USE_MMAP
-#     define USE_MMAP_ANON
-#     define USE_ASM_PUSH_REGS
-#     ifdef GC_DARWIN_THREADS
-#       define MPROTECT_VDB
-#     endif
-#     include <unistd.h>
-#     define GETPAGESIZE() getpagesize()
-      /* There seems to be some issues with trylock hanging on darwin. This
-	 should be looked into some more */
-#     define NO_PTHREAD_TRYLOCK
-#   endif /* DARWIN */
-# endif
-
-# ifdef NS32K
-#   define MACH_TYPE "NS32K"
-#   define ALIGNMENT 4
-    extern char **environ;
-#   define DATASTART ((ptr_t)(&environ))
-			      /* hideous kludge: environ is the first   */
-			      /* word in crt0.o, and delimits the start */
-			      /* of the data segment, no matter which   */
-			      /* ld options were passed through.        */
-#   define STACKBOTTOM ((ptr_t) 0xfffff000) /* for Encore */
-# endif
-
-# ifdef MIPS
-#   define MACH_TYPE "MIPS"
-#   ifdef LINUX
-      /* This was developed for a linuxce style platform.  Probably	*/
-      /* needs to be tweaked for workstation class machines.		*/
-#     define OS_TYPE "LINUX"
-#     define DYNAMIC_LOADING
-      extern int _end[];
-#     define DATAEND (_end)
-      extern int __data_start[];
-#     define DATASTART ((ptr_t)(__data_start))
-#     ifdef _MIPS_SZPTR
-#	define CPP_WORDSZ _MIPS_SZPTR
-#	define ALIGNMENT (_MIPS_SZPTR/8)
-#     else
-#	define ALIGNMENT 4
-#     endif
-#     ifndef HBLKSIZE
-#       define HBLKSIZE 4096
-#     endif
-#     define USE_GENERIC_PUSH_REGS
-#     if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
-#        define LINUX_STACKBOTTOM
-#     else
-#        define STACKBOTTOM 0x80000000
-#     endif
-#   endif /* Linux */
-#   ifdef EWS4800
-#      define HEURISTIC2
-#      if defined(_MIPS_SZPTR) && (_MIPS_SZPTR == 64)
-         extern int _fdata[], _end[];
-#        define DATASTART ((ptr_t)_fdata)
-#        define DATAEND ((ptr_t)_end)
-#        define CPP_WORDSZ _MIPS_SZPTR
-#        define ALIGNMENT (_MIPS_SZPTR/8)
-#      else
-         extern int etext[], edata[], end[];
-         extern int _DYNAMIC_LINKING[], _gp[];
-#        define DATASTART ((ptr_t)((((word)etext + 0x3ffff) & ~0x3ffff) \
-               + ((word)etext & 0xffff)))
-#        define DATAEND (edata)
-#        define DATASTART2 (_DYNAMIC_LINKING \
-               ? (ptr_t)(((word)_gp + 0x8000 + 0x3ffff) & ~0x3ffff) \
-               : (ptr_t)edata)
-#        define DATAEND2 (end)
-#        define ALIGNMENT 4
-#      endif
-#      define OS_TYPE "EWS4800"
-#      define USE_GENERIC_PUSH_REGS 1
-#   endif
-#   ifdef ULTRIX
-#	define HEURISTIC2
-#       define DATASTART (ptr_t)0x10000000
-			      /* Could probably be slightly higher since */
-			      /* startup code allocates lots of stuff.   */
-#	define OS_TYPE "ULTRIX"
-#       define ALIGNMENT 4
-#   endif
-#   ifdef RISCOS
-#	define HEURISTIC2
-#       define DATASTART (ptr_t)0x10000000
-#	define OS_TYPE "RISCOS"
-#   	define ALIGNMENT 4  /* Required by hardware */
-#   endif
-#   ifdef IRIX5
-#	define HEURISTIC2
-        extern int _fdata[];
-#       define DATASTART ((ptr_t)(_fdata))
-#       ifdef USE_MMAP
-#         define HEAP_START (ptr_t)0x30000000
-#       else
-#	  define HEAP_START DATASTART
-#       endif
-			      /* Lowest plausible heap address.		*/
-			      /* In the MMAP case, we map there.	*/
-			      /* In either case it is used to identify	*/
-			      /* heap sections so they're not 		*/
-			      /* considered as roots.			*/
-#	define OS_TYPE "IRIX5"
-/*#       define MPROTECT_VDB DOB: this should work, but there is evidence */
-/* 	  	of recent breakage.					   */
-#       ifdef _MIPS_SZPTR
-#	  define CPP_WORDSZ _MIPS_SZPTR
-#	  define ALIGNMENT (_MIPS_SZPTR/8)
-#	  if CPP_WORDSZ != 64
-#	    define ALIGN_DOUBLE
-#	  endif
-#	  if _MIPS_SZPTR == 64
-#	    define ELF_CLASS ELFCLASS64
-#	  endif
-#	else
-#         define ALIGNMENT 4
-#	  define ALIGN_DOUBLE
-#	endif
-#	define DYNAMIC_LOADING
-#   endif
-#   ifdef MSWINCE
-#       define OS_TYPE "MSWINCE"
-#       define ALIGNMENT 4
-#       define DATAEND /* not needed */
-#   endif
-#   if defined(NETBSD)
-#     define ALIGNMENT 4
-#     define OS_TYPE "NETBSD"
-#     define HEURISTIC2
-#     define USE_GENERIC_PUSH_REGS
-#     ifdef __ELF__
-        extern int etext[];
-#       define DATASTART GC_data_start
-#       define NEED_FIND_LIMIT
-#       define DYNAMIC_LOADING
-#     else
-#       define DATASTART ((ptr_t) 0x10000000)
-#       define STACKBOTTOM ((ptr_t) 0x7ffff000)
-#     endif /* _ELF_ */
-#  endif
-# endif
-
-# ifdef RS6000
-#   define MACH_TYPE "RS6000"
-#   ifdef ALIGNMENT
-#     undef ALIGNMENT
-#   endif
-#   ifdef IA64
-#     undef IA64 /* DOB: some AIX installs stupidly define IA64 in /usr/include/sys/systemcfg.h */
-#   endif
-#   ifdef __64BIT__
-#     define ALIGNMENT 8
-#     define CPP_WORDSZ 64
-#     define STACKBOTTOM ((ptr_t)0x1000000000000000)
-#   else
-#     define ALIGNMENT 4
-#     define CPP_WORDSZ 32
-#     define STACKBOTTOM ((ptr_t)((ulong)&errno))
-#   endif
-#   define USE_MMAP
-#   define USE_MMAP_ANON
- /* From AIX linker man page:
- _text Specifies the first location of the program.
- _etext Specifies the first location after the program.
- _data Specifies the first location of the data.
- _edata Specifies the first location after the initialized data
- _end or end Specifies the first location after all data.
- */
-    extern int _data[], _end[];
-#   define DATASTART ((ptr_t)((ulong)_data))
-#   define DATAEND ((ptr_t)((ulong)_end))
-    extern int errno;
-#   define USE_GENERIC_PUSH_REGS
-#   define DYNAMIC_LOADING
-	/* For really old versions of AIX, this may have to be removed. */
-# endif
-
-# ifdef HP_PA
-#   define MACH_TYPE "HP_PA"
-#   ifdef __LP64__
-#     define CPP_WORDSZ 64
-#     define ALIGNMENT 8
-#   else
-#     define CPP_WORDSZ 32
-#     define ALIGNMENT 4
-#     define ALIGN_DOUBLE
-#   endif
-#   if !defined(GC_HPUX_THREADS) && !defined(GC_LINUX_THREADS)
-#     ifndef LINUX /* For now. */
-#       define MPROTECT_VDB
-#     endif
-#   else
-#     define GENERIC_COMPARE_AND_SWAP
-	/* No compare-and-swap instruction.  Use pthread mutexes 	*/
-	/* when we absolutely have to.					*/
-#     ifdef PARALLEL_MARK
-#	define USE_MARK_BYTES
-		/* Minimize compare-and-swap usage.		*/
-#     endif
-#   endif
-#   define STACK_GROWS_UP
-#   ifdef HPUX
-#     define OS_TYPE "HPUX"
-      extern int __data_start[];
-#     define DATASTART ((ptr_t)(__data_start))
-#     if 0
-	/* The following appears to work for 7xx systems running HP/UX	*/
-	/* 9.xx Furthermore, it might result in much faster		*/
-	/* collections than HEURISTIC2, which may involve scanning	*/
-	/* segments that directly precede the stack.  It is not the	*/
-	/* default, since it may not work on older machine/OS		*/
-	/* combinations. (Thanks to Raymond X.T. Nijssen for uncovering	*/
-	/* this.)							*/
-#       define STACKBOTTOM ((ptr_t) 0x7b033000)  /* from /etc/conf/h/param.h */
-#     else
-	/* Gustavo Rodriguez-Rivera suggested changing HEURISTIC2	*/
-	/* to this.  Note that the GC must be initialized before the	*/
-    	/* first putenv call.						*/
-	extern char ** environ;
-#       define STACKBOTTOM ((ptr_t)environ)
-#     endif
-#     define DYNAMIC_LOADING
-#     include <unistd.h>
-#     define GETPAGESIZE() sysconf(_SC_PAGE_SIZE)
-#     ifndef __GNUC__
-#       define PREFETCH(x)  { \
-                              register long addr = (long)(x); \
-                              (void) _asm ("LDW", 0, 0, addr, 0); \
-                            }
-#     endif
-#   endif /* HPUX */
-#   ifdef LINUX
-#     define OS_TYPE "LINUX"
-#     define LINUX_STACKBOTTOM
-#     define DYNAMIC_LOADING
-#     define SEARCH_FOR_DATA_START
-      extern int _end[];
-#     define DATAEND (&_end)
-#   endif /* LINUX */
-# endif /* HP_PA */
-
-# ifdef ALPHA
-#   define MACH_TYPE "ALPHA"
-#   define ALIGNMENT 8
-#   define CPP_WORDSZ 64
-#   ifndef LINUX
-#     define USE_GENERIC_PUSH_REGS
-      /* Gcc and probably the DEC/Compaq compiler spill pointers to preserved */
-      /* fp registers in some cases when the target is a 21264.  The assembly */
-      /* code doesn't handle that yet, and version dependencies make that a   */
-      /* bit tricky.  Do the easy thing for now.				    */
-#   endif
-#   ifdef NETBSD
-#	define OS_TYPE "NETBSD"
-#	define HEURISTIC2
-#	define DATASTART GC_data_start
-#	define ELFCLASS32 32
-#	define ELFCLASS64 64
-#	define ELF_CLASS ELFCLASS64
-#       define DYNAMIC_LOADING
-#   endif
-#   ifdef OPENBSD
-#	define OS_TYPE "OPENBSD"
-#	define HEURISTIC2
-#   	ifdef __ELF__	/* since OpenBSD/Alpha 2.9 */
-#	   define DATASTART GC_data_start
-#   	   define ELFCLASS32 32
-#   	   define ELFCLASS64 64
-#   	   define ELF_CLASS ELFCLASS64
-#       else		/* ECOFF, until OpenBSD/Alpha 2.7 */
-#   	   define DATASTART ((ptr_t) 0x140000000)
-#   	endif
-#   endif
-#   ifdef FREEBSD
-#	define OS_TYPE "FREEBSD"
-/* MPROTECT_VDB is not yet supported at all on FreeBSD/alpha. */
-#	define SIG_SUSPEND SIGUSR1
-#	define SIG_THR_RESTART SIGUSR2
-#	define FREEBSD_STACKBOTTOM
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-/* Handle unmapped hole alpha*-*-freebsd[45]* puts between etext and edata. */
-	extern char etext[];
-	extern char edata[];
-	extern char end[];
-#	define NEED_FIND_LIMIT
-#	define DATASTART ((ptr_t)(&etext))
-#	define DATAEND (GC_find_limit (DATASTART, TRUE))
-#	define DATASTART2 ((ptr_t)(&edata))
-#	define DATAEND2 ((ptr_t)(&end))
-#   endif
-#   ifdef OSF1
-#	define OS_TYPE "OSF1"
-#   	define DATASTART ((ptr_t) 0x140000000)
-	extern int _end[];
-#   	define DATAEND ((ptr_t) &_end)
- 	extern char ** environ;
-	/* round up from the value of environ to the nearest page boundary */
-	/* Probably breaks if putenv is called before collector 	   */
-	/* initialization.						   */
-#	define STACKBOTTOM ((ptr_t)(((word)(environ) | (getpagesize()-1))+1))
-/* #   	define HEURISTIC2 */
-	/* Normally HEURISTIC2 is too conervative, since		*/
-	/* the text segment immediately follows the stack.		*/
-	/* Hence we give an upper pound.				*/
-	/* This is currently unused, since we disabled HEURISTIC2	*/
-    	extern int __start[];
-#   	define HEURISTIC2_LIMIT ((ptr_t)((word)(__start) & ~(getpagesize()-1)))
-#	ifndef GC_OSF1_THREADS
-	  /* Unresolved signal issues with threads.	*/
-#   	  define MPROTECT_VDB
-#       endif
-#   	define DYNAMIC_LOADING
-#   endif
-#   ifdef LINUX
-#       define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#       ifdef __ELF__
-#	  define SEARCH_FOR_DATA_START
-#         define DYNAMIC_LOADING
-#       else
-#           define DATASTART ((ptr_t) 0x140000000)
-#       endif
-	extern int _end[];
-#	define DATAEND (_end)
-#	define MPROTECT_VDB
-		/* Has only been superficially tested.  May not	*/
-		/* work on all versions.			*/
-#   endif
-# endif
-
-# ifdef IA64
-#   define MACH_TYPE "IA64"
-#   define USE_GENERIC_PUSH_REGS
-	/* We need to get preserved registers in addition to register   */
-	/* windows.   That's easiest to do with setjmp.			*/
-#   ifdef PARALLEL_MARK
-#	define USE_MARK_BYTES
-	    /* Compare-and-exchange is too expensive to use for 	*/
-	    /* setting mark bits.					*/
-#   endif
-#   ifdef HPUX
-#	ifdef _ILP32
-#	  define CPP_WORDSZ 32
-#         define ALIGN_DOUBLE
-	    /* Requires 8 byte alignment for malloc */
-#   	  define ALIGNMENT 4
-#       else
-#	  ifndef _LP64
-		---> unknown ABI
-#         endif
-#	  define CPP_WORDSZ 64
-#   	  define ALIGN_DOUBLE
-	    /* Requires 16 byte alignment for malloc */
-#         define ALIGNMENT 8
-#       endif
-#       define OS_TYPE "HPUX"	
-        extern int __data_start[];
-#       define DATASTART ((ptr_t)(__data_start))
-        /* Gustavo Rodriguez-Rivera suggested changing HEURISTIC2	*/
-        /* to this.  Note that the GC must be initialized before the	*/
-    	/* first putenv call.						*/
-	extern char ** environ;
-#       define STACKBOTTOM ((ptr_t)environ)
-#       define HPUX_STACKBOTTOM
-#       define DYNAMIC_LOADING
-#       include <unistd.h>
-#       define GETPAGESIZE() sysconf(_SC_PAGE_SIZE)
- 	/* The following was empirically determined, and is probably	*/
-	/* not very robust.						*/
-	/* Note that the backing store base seems to be at a nice 	*/
-	/* address minus one page.					*/
-#	define BACKING_STORE_DISPLACEMENT 0x1000000
-#	define BACKING_STORE_ALIGNMENT 0x1000
-	extern ptr_t GC_register_stackbottom;
-#	define BACKING_STORE_BASE GC_register_stackbottom
-	/* Known to be wrong for recent HP/UX versions!!!	*/
-#   endif
-#   ifdef LINUX
-#   	define CPP_WORDSZ 64
-#   	define ALIGN_DOUBLE
-	  /* Requires 16 byte alignment for malloc */
-#   	define ALIGNMENT 8
-#       define OS_TYPE "LINUX"
-	/* The following works on NUE and older kernels:	*/
-/* #       define STACKBOTTOM ((ptr_t) 0xa000000000000000l)	*/
-	/* This does not work on NUE:				*/
-#       define LINUX_STACKBOTTOM
-	/* We also need the base address of the register stack	*/
-	/* backing store.  This is computed in 			*/
-	/* GC_linux_register_stack_base based on the following	*/
-	/* constants:						*/
-#       define BACKING_STORE_ALIGNMENT 0x100000
-#       define BACKING_STORE_DISPLACEMENT 0x80000000
-	extern ptr_t GC_register_stackbottom;
-#	define BACKING_STORE_BASE GC_register_stackbottom
-#	define SEARCH_FOR_DATA_START
-#	ifdef __GNUC__
-#         define DYNAMIC_LOADING
-#	else
-	  /* In the Intel compiler environment, we seem to end up with  */
-	  /* statically linked executables and an undefined reference	*/
-	  /* to _DYNAMIC						*/
-#  	endif
-#	define MPROTECT_VDB
-		/* Requires Linux 2.3.47 or later.	*/
-	extern int _end[];
-#	define DATAEND (_end)
-#       ifdef __GNUC__
-#	  ifndef __INTEL_COMPILER
-#	    define PREFETCH(x) \
-	      __asm__ ("	lfetch	[%0]": : "r"(x))
-#	    define PREFETCH_FOR_WRITE(x) \
-	      __asm__ ("	lfetch.excl	[%0]": : "r"(x))
-#	    define CLEAR_DOUBLE(x) \
-	      __asm__ ("	stf.spill	[%0]=f0": : "r"((void *)(x)))
-#	  else
-#           include <ia64intrin.h>
-#	    define PREFETCH(x) \
-	      __lfetch(__lfhint_none, (x))
-#	    define PREFETCH_FOR_WRITE(x) \
-	      __lfetch(__lfhint_nta,  (x))
-#	    define CLEAR_DOUBLE(x) \
-	      __stf_spill((void *)(x), 0)
-#	  endif // __INTEL_COMPILER
-#       endif
-#   endif
-#   ifdef MSWIN32
-      /* FIXME: This is a very partial guess.  There is no port, yet.	*/
-#     define OS_TYPE "MSWIN32"
-		/* STACKBOTTOM and DATASTART are handled specially in 	*/
-		/* os_dep.c.						*/
-#     define DATAEND  /* not needed */
-#     if defined(_WIN64)
-#       define CPP_WORDSZ 64
-#     else
-#       define CPP_WORDSZ 32   /* Is this possible?	*/
-#     endif
-#     define ALIGNMENT 8
-#   endif
-# endif
-
-# ifdef M88K
-#   define MACH_TYPE "M88K"
-#   define ALIGNMENT 4
-#   define ALIGN_DOUBLE
-    extern int etext[];
-#   ifdef CX_UX
-#	define OS_TYPE "CX_UX"
-#       define DATASTART ((((word)etext + 0x3fffff) & ~0x3fffff) + 0x10000)
-#   endif
-#   ifdef  DGUX
-#	define OS_TYPE "DGUX"
-	extern ptr_t GC_SysVGetDataStart();
-#       define DATASTART GC_SysVGetDataStart(0x10000, etext)
-#   endif
-#   define STACKBOTTOM ((char*)0xf0000000) /* determined empirically */
-# endif
-
-# ifdef S370
-    /* If this still works, and if anyone cares, this should probably	*/
-    /* be moved to the S390 category.					*/
-#   define MACH_TYPE "S370"
-#   define ALIGNMENT 4	/* Required by hardware	*/
-#   define USE_GENERIC_PUSH_REGS
-#   ifdef UTS4
-#       define OS_TYPE "UTS4"
-	extern int etext[];
-	extern int _etext[];
-	extern int _end[];
-	extern ptr_t GC_SysVGetDataStart();
-#       define DATASTART GC_SysVGetDataStart(0x10000, _etext)
-#	define DATAEND (_end)
-#	define HEURISTIC2
-#   endif
-# endif
-
-# ifdef S390
-#   define MACH_TYPE "S390"
-#   define USE_GENERIC_PUSH_REGS
-#   ifndef __s390x__
-#     define ALIGNMENT 4
-#     define CPP_WORDSZ 32
-#   else
-#     define ALIGNMENT 8
-#     define CPP_WORDSZ 64
-#   endif
-#   ifndef HBLKSIZE
-#     define HBLKSIZE 4096
-#   endif
-#   ifdef LINUX
-#       define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#       define DYNAMIC_LOADING
-	extern int __data_start[];
-#       define DATASTART ((ptr_t)(__data_start))
-    extern int _end[];
-#   define DATAEND (_end)
-#   define CACHE_LINE_SIZE 256
-#   define GETPAGESIZE() 4096
-#   endif
-# endif
-
-# if defined(PJ)
-#   define ALIGNMENT 4
-    extern int _etext[];
-#   define DATASTART ((ptr_t)(_etext))
-#   define HEURISTIC1
-# endif
-
-# ifdef AARCH64
-#   ifdef __ILP32__
-#     define ALIGNMENT 4
-#     define CPP_WORDSZ 32
-#   else
-#     define ALIGNMENT 8
-#     define CPP_WORDSZ 64
-#   endif
-#   define MACH_TYPE "AARCH64"
-#   ifndef HBLKSIZE
-#     define HBLKSIZE 4096
-#   endif
-#   ifdef LINUX
-#     define OS_TYPE "LINUX"
-#     define LINUX_STACKBOTTOM
-#     define USE_GENERIC_PUSH_REGS
-#     define DYNAMIC_LOADING
-      extern int __data_start[];
-#     define DATASTART ((ptr_t)__data_start)
-      extern char _end[];
-#     define DATAEND ((ptr_t)(&_end))
-#   endif
-#   ifdef NOSYS
-      /* __data_start is usually defined in the target linker script.   */
-      extern int __data_start[];
-#     define DATASTART ((ptr_t)__data_start)
-      extern void *__stack_base__;
-#     define STACKBOTTOM ((ptr_t)__stack_base__)
-#   endif
-# endif
-
-# ifdef ARM32
-#   define CPP_WORDSZ 32
-#   define MACH_TYPE "ARM32"
-#   define ALIGNMENT 4
-#   ifdef NETBSD
-#       define OS_TYPE "NETBSD"
-#       define HEURISTIC2
-#	ifdef __ELF__
-#          define DATASTART GC_data_start
-#	   define DYNAMIC_LOADING
-#	else
-           extern char etext[];
-#          define DATASTART ((ptr_t)(etext))
-#	endif
-#       define USE_GENERIC_PUSH_REGS
-#   endif
-#   ifdef LINUX
-#       define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#       undef STACK_GRAN
-#       define STACK_GRAN 0x10000000
-#       define USE_GENERIC_PUSH_REGS
-#       ifdef __ELF__
-#            define DYNAMIC_LOADING
-#	     include <features.h>
-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
-#		 define SEARCH_FOR_DATA_START
-#	     else
-     	         extern char **__environ;
-#                define DATASTART ((ptr_t)(&__environ))
-			      /* hideous kludge: __environ is the first */
-			      /* word in crt0.o, and delimits the start */
-			      /* of the data segment, no matter which   */
-			      /* ld options were passed through.        */
-			      /* We could use _etext instead, but that  */
-			      /* would include .rodata, which may       */
-			      /* contain large read-only data tables    */
-			      /* that we'd rather not scan.		*/
-#	     endif
-	     extern int _end[];
-#	     define DATAEND (_end)
-#	else
-	     extern int etext[];
-#            define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       endif
-#   endif
-#   ifdef MSWINCE
-#     define OS_TYPE "MSWINCE"
-#     define DATAEND /* not needed */
-#   endif
-#   ifdef NOSYS
-      /* __data_start is usually defined in the target linker script.  */
-      extern int __data_start[];
-#     define DATASTART (ptr_t)(__data_start)
-#     define USE_GENERIC_PUSH_REGS
-      /* __stack_base__ is set in newlib/libc/sys/arm/crt0.S  */
-      extern void *__stack_base__;
-#     define STACKBOTTOM ((ptr_t) (__stack_base__))
-#   endif
-#endif
-
-# ifdef CRIS
-#   define MACH_TYPE "CRIS"
-#   define CPP_WORDSZ 32
-#   define ALIGNMENT 1
-#   define OS_TYPE "LINUX"
-#   define DYNAMIC_LOADING
-#   define LINUX_STACKBOTTOM
-#   define USE_GENERIC_PUSH_REGS
-#   define SEARCH_FOR_DATA_START
-      extern int _end[];
-#   define DATAEND (_end)
-# endif
-
-# ifdef SH
-#   define MACH_TYPE "SH"
-#   define ALIGNMENT 4
-#   ifdef MSWINCE
-#     define OS_TYPE "MSWINCE"
-#     define DATAEND /* not needed */
-#   endif
-#   ifdef LINUX
-#     define OS_TYPE "LINUX"
-#     define LINUX_STACKBOTTOM
-#     define USE_GENERIC_PUSH_REGS
-#     define DYNAMIC_LOADING
-#     define SEARCH_FOR_DATA_START
-      extern int _end[];
-#     define DATAEND (_end)
-#   endif
-#   ifdef NETBSD
-#      define OS_TYPE "NETBSD"
-#      define HEURISTIC2
-#      define DATASTART GC_data_start
-#       define USE_GENERIC_PUSH_REGS
-#      define DYNAMIC_LOADING
-#   endif
-# endif
- 
-# ifdef SH4
-#   define MACH_TYPE "SH4"
-#   define OS_TYPE "MSWINCE"
-#   define ALIGNMENT 4
-#   define DATAEND /* not needed */
-# endif
-
-# ifdef M32R
-#   define CPP_WORDSZ 32
-#   define MACH_TYPE "M32R"
-#   define ALIGNMENT 4
-#   ifdef LINUX
-#     define OS_TYPE "LINUX"
-#     define LINUX_STACKBOTTOM
-#     undef STACK_GRAN
-#     define STACK_GRAN 0x10000000
-#     define USE_GENERIC_PUSH_REGS
-#     define DYNAMIC_LOADING
-#     define SEARCH_FOR_DATA_START
-      extern int _end[];
-#     define DATAEND (_end)
-#   endif
-# endif
-
-# ifdef X86_64
-#   define MACH_TYPE "X86_64"
-#   ifdef __ILP32__
-#     define ALIGNMENT 4
-#     define CPP_WORDSZ 32
-#   else
-#     define ALIGNMENT 8
-#     define CPP_WORDSZ 64
-#   endif
-#   ifndef HBLKSIZE
-#     define HBLKSIZE 4096
-#   endif
-#   define CACHE_LINE_SIZE 64
-#   define USE_GENERIC_PUSH_REGS
-#   ifdef LINUX
-#	define OS_TYPE "LINUX"
-#       define LINUX_STACKBOTTOM
-#       if !defined(GC_LINUX_THREADS) || !defined(REDIRECT_MALLOC)
-#	    define MPROTECT_VDB
-#	else
-	    /* We seem to get random errors in incremental mode,	*/
-	    /* possibly because Linux threads is itself a malloc client */
-	    /* and can't deal with the signals.				*/
-#	endif
-#       ifdef __ELF__
-#            define DYNAMIC_LOADING
-#	     ifdef UNDEFINED	/* includes ro data */
-	       extern int _etext[];
-#              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
-#	     endif
-#	     include <features.h>
-#	     define SEARCH_FOR_DATA_START
-	     extern int _end[];
-#	     define DATAEND (_end)
-#	else
-	     extern int etext[];
-#            define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-#       endif
-#       if defined(__GNUC__) && __GNUC >= 3
-#	    define PREFETCH(x) __builtin_prefetch((x), 0, 0)
-#	    define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
-#	endif
-#   endif
-#   ifdef DARWIN
-#     define OS_TYPE "DARWIN"
-#     define DARWIN_DONT_PARSE_STACK
-#     define DYNAMIC_LOADING
-      /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-	 These aren't used when dyld support is enabled (it is by default) */
-#     define DATASTART ((ptr_t) get_etext())
-#     define DATAEND	((ptr_t) get_end())
-#     ifdef HAVE_PTHREAD_GET_STACKADDR_NP
-#       define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self())
-#     else
-#       define STACKBOTTOM ((ptr_t) 0x7fff5fc00000)
-#     endif
-#     define USE_MMAP
-#     define USE_MMAP_ANON
-#     ifdef GC_DARWIN_THREADS
-#       define MPROTECT_VDB
-#     endif
-#     include <unistd.h>
-#     define GETPAGESIZE() getpagesize()
-      /* There seems to be some issues with trylock hanging on darwin. This
-	 should be looked into some more */
-#     define NO_PTHREAD_TRYLOCK
-#   endif
-#   ifdef FREEBSD
-#	define OS_TYPE "FREEBSD"
-#	ifndef GC_FREEBSD_THREADS
-#	    define MPROTECT_VDB
-#	endif
-#	ifdef __GLIBC__
-#	    define SIG_SUSPEND		(32+6)
-#	    define SIG_THR_RESTART	(32+5)
-	    extern int _end[];
-#	    define DATAEND (_end)
-#	else
-#	    define SIG_SUSPEND SIGUSR1
-#	    define SIG_THR_RESTART SIGUSR2
-#	endif
-#	define FREEBSD_STACKBOTTOM
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-	extern char etext[];
-	extern char * GC_FreeBSDGetDataStart();
-#	define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-#   endif
-#   ifdef NETBSD
-#	define OS_TYPE "NETBSD"
-#	ifdef __ELF__
-#	    define DYNAMIC_LOADING
-#	endif
-#	define HEURISTIC2
-	extern char etext[];
-#	define SEARCH_FOR_DATA_START
-#   endif
-#   ifdef SUNOS5
-#	define ELF_CLASS ELFCLASS64
-#	define OS_TYPE "SUNOS5"
-        extern int _etext[], _end[];
-  	extern ptr_t GC_SysVGetDataStart();
-#       define DATASTART GC_SysVGetDataStart(0x1000, _etext)
-#	define DATAEND (_end)
-/*	# define STACKBOTTOM ((ptr_t)(_start)) worked through 2.7,  	*/
-/*      but reportedly breaks under 2.8.  It appears that the stack	*/
-/* 	base is a property of the executable, so this should not break	*/
-/* 	old executables.						*/
-/*  	HEURISTIC2 probably works, but this appears to be preferable.	*/
-/* #       include <sys/vm.h> */
-/* #	define STACKBOTTOM USRSTACK */
-#	define HEURISTIC2
-#	define PROC_VDB
-#	define DYNAMIC_LOADING
-#	if !defined(USE_MMAP) && defined(REDIRECT_MALLOC)
-#	    define USE_MMAP
-	    /* Otherwise we now use calloc.  Mmap may result in the	*/
-	    /* heap interleaved with thread stacks, which can result in	*/
-	    /* excessive blacklisting.  Sbrk is unusable since it	*/
-	    /* doesn't interact correctly with the system malloc.	*/
-#	endif
-#       ifdef USE_MMAP
-#         define HEAP_START (ptr_t)0x40000000
-#       else
-#	  define HEAP_START DATAEND
-#       endif
-#   endif
-# endif
-
-#if (defined(LINUX) || defined(HURD)) && defined(USE_MMAP)
-    /* The kernel may do a somewhat better job merging mappings etc.	*/
-    /* with anonymous mappings.						*/
-#   define USE_MMAP_ANON
-#endif
-
-#if defined(LINUX) && defined(REDIRECT_MALLOC)
-    /* Rld appears to allocate some memory with its own allocator, and	*/
-    /* some through malloc, which might be redirected.  To make this	*/
-    /* work with collectable memory, we have to scan memory allocated	*/
-    /* by rld's internal malloc.					*/
-#   define USE_PROC_FOR_LIBRARIES
-#endif
-    
-# ifndef STACK_GROWS_UP
-#   define STACK_GROWS_DOWN
-# endif
-
-# ifndef CPP_WORDSZ
-#   define CPP_WORDSZ 32
-# endif
-
-# ifndef OS_TYPE
-#   define OS_TYPE ""
-# endif
-
-# ifndef DATAEND
-    extern int end[];
-#   define DATAEND (end)
-# endif
-
-# if defined(SVR4) && !defined(GETPAGESIZE)
-#    include <unistd.h>
-#    define GETPAGESIZE()  sysconf(_SC_PAGESIZE)
-# endif
-
-# ifndef GETPAGESIZE
-#   if defined(SUNOS5) || defined(IRIX5)
-#	include <unistd.h>
-#   endif
-#   define GETPAGESIZE() getpagesize()
-# endif
-
-# if defined(SUNOS5) || defined(DRSNX) || defined(UTS4)
-	    /* OS has SVR4 generic features.  Probably others also qualify.	*/
-#   define SVR4
-# endif
-
-# if defined(SUNOS5) || defined(DRSNX)
-	    /* OS has SUNOS5 style semi-undocumented interface to dynamic 	*/
-	    /* loader.								*/
-#   define SUNOS5DL
-	    /* OS has SUNOS5 style signal handlers.				*/
-#   define SUNOS5SIGS
-# endif
-
-# if defined(HPUX)
-#   define SUNOS5SIGS
-# endif
-
-# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
-#   define SUNOS5SIGS
-# endif
-
-# if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
-	    || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
-	    || defined(DGUX) || defined(BSD) || defined(SUNOS4) \
-	    || defined(_AIX) || defined(DARWIN) || defined(OSF1) \
-	    || defined(HURD)
-#   define UNIX_LIKE   /* Basic Unix-like system calls work.	*/
-# endif
-
-# if CPP_WORDSZ != 32 && CPP_WORDSZ != 64
-	   -> bad word size
-# endif
-
-# ifdef PCR
-#   undef DYNAMIC_LOADING
-#   undef STACKBOTTOM
-#   undef HEURISTIC1
-#   undef HEURISTIC2
-#   undef PROC_VDB
-#   undef MPROTECT_VDB
-#   define PCR_VDB
-# endif
-
-# ifdef SRC_M3
-	/* Postponed for now. */
-#   undef PROC_VDB
-#   undef MPROTECT_VDB
-# endif
-
-# ifdef SMALL_CONFIG
-	/* Presumably not worth the space it takes. */
-#   undef PROC_VDB
-#   undef MPROTECT_VDB
-# endif
-
-# ifdef USE_MUNMAP
-#   undef MPROTECT_VDB  /* Can't deal with address space holes. */
-# endif
-
-# ifdef PARALLEL_MARK
-#   undef MPROTECT_VDB  /* For now.	*/
-# endif
-
-# if !defined(PCR_VDB) && !defined(PROC_VDB) && !defined(MPROTECT_VDB)
-#   define DEFAULT_VDB
-# endif
-
-# ifndef PREFETCH
-#   define PREFETCH(x)
-#   define NO_PREFETCH
-# endif
-
-# ifndef PREFETCH_FOR_WRITE
-#   define PREFETCH_FOR_WRITE(x)
-#   define NO_PREFETCH_FOR_WRITE
-# endif
-
-# ifndef CACHE_LINE_SIZE
-#   define CACHE_LINE_SIZE 32	/* Wild guess	*/
-# endif
-
-# if defined(LINUX) || defined(HURD) || defined(__GLIBC__)
-#   define REGISTER_LIBRARIES_EARLY
-    /* We sometimes use dl_iterate_phdr, which may acquire an internal	*/
-    /* lock.  This isn't safe after the world has stopped.  So we must	*/
-    /* call GC_register_dynamic_libraries before stopping the world.	*/
-    /* For performance reasons, this may be beneficial on other		*/
-    /* platforms as well, though it should be avoided in win32.		*/
-# endif /* LINUX */
-
-# if defined(SEARCH_FOR_DATA_START)
-    extern ptr_t GC_data_start;
-#   define DATASTART GC_data_start
-# endif
-
-# ifndef CLEAR_DOUBLE
-#   define CLEAR_DOUBLE(x) \
-		((word*)x)[0] = 0; \
-		((word*)x)[1] = 0;
-# endif /* CLEAR_DOUBLE */
-
-# if defined(GC_IRIX_THREADS) && !defined(IRIX5)
-	--> inconsistent configuration
-# endif
-# if defined(GC_LINUX_THREADS) && !defined(LINUX)
-	--> inconsistent configuration
-# endif
-# if defined(GC_SOLARIS_THREADS) && !defined(SUNOS5)
-	--> inconsistent configuration
-# endif
-# if defined(GC_HPUX_THREADS) && !defined(HPUX)
-	--> inconsistent configuration
-# endif
-# if defined(GC_AIX_THREADS) && !defined(_AIX)
-	--> inconsistent configuration
-# endif
-# if defined(GC_GNU_THREADS) && !defined(HURD)
-	--> inconsistent configuration
-# endif
-# if defined(GC_WIN32_THREADS) && !defined(MSWIN32) && !defined(CYGWIN32)
-	--> inconsistent configuration
-# endif
-
-# if defined(PCR) || defined(SRC_M3) || \
-		defined(GC_SOLARIS_THREADS) || defined(GC_WIN32_THREADS) || \
-		defined(GC_PTHREADS)
-#   define THREADS
-# endif
-
-# if defined(HP_PA) || defined(M88K) \
-             || defined(POWERPC) && !defined(DARWIN) \
-	     || defined(LINT) || defined(MSWINCE) || defined(ARM32) || defined(CRIS) \
-	     || (defined(I386) && defined(__LCC__))
-	/* Use setjmp based hack to mark from callee-save registers.    */
-	/* The define should move to the individual platform 		*/
-	/* descriptions.						*/
-#	define USE_GENERIC_PUSH_REGS
-# endif
-
-# if defined(MSWINCE)
-#   define NO_GETENV
-# endif
-
-# if defined(SPARC)
-#   define ASM_CLEAR_CODE	/* Stack clearing is crucial, and we 	*/
-				/* include assembly code to do it well.	*/
-# endif
-
-  /* Can we save call chain in objects for debugging?   	        */
-  /* SET NFRAMES (# of saved frames) and NARGS (#of args for each 	*/
-  /* frame) to reasonable values for the platform.			*/
-  /* Set SAVE_CALL_CHAIN if we can.  SAVE_CALL_COUNT can be specified 	*/
-  /* at build time, though we feel free to adjust it slightly.		*/
-  /* Define NEED_CALLINFO if we either save the call stack or 		*/
-  /* GC_ADD_CALLER is defined.						*/
-  /* GC_CAN_SAVE_CALL_STACKS is set in gc.h.				*/
-
-#if defined(SPARC)
-# define CAN_SAVE_CALL_ARGS
-#endif
-#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
-	    /* SAVE_CALL_CHAIN is supported if the code is compiled to save	*/
-	    /* frame pointers by default, i.e. no -fomit-frame-pointer flag.	*/
-# define CAN_SAVE_CALL_ARGS
-#endif
-
-# if defined(SAVE_CALL_COUNT) && !defined(GC_ADD_CALLER) \
-	     && defined(GC_CAN_SAVE_CALL_STACKS)
-#   define SAVE_CALL_CHAIN 
-# endif
-# ifdef SAVE_CALL_CHAIN
-#   if defined(SAVE_CALL_NARGS) && defined(CAN_SAVE_CALL_ARGS)
-#     define NARGS SAVE_CALL_NARGS
-#   else
-#     define NARGS 0	/* Number of arguments to save for each call.	*/
-#   endif
-# endif
-# ifdef SAVE_CALL_CHAIN
-#   ifndef SAVE_CALL_COUNT
-#     define NFRAMES 6	/* Number of frames to save. Even for		*/
-				/* alignment reasons.				*/
-#   else
-#     define NFRAMES ((SAVE_CALL_COUNT + 1) & ~1)
-#   endif
-#   define NEED_CALLINFO
-# endif /* SAVE_CALL_CHAIN */
-# ifdef GC_ADD_CALLER
-#   define NFRAMES 1
-#   define NARGS 0
-#   define NEED_CALLINFO
-# endif
-
-# if defined(MAKE_BACK_GRAPH) && !defined(DBG_HDRS_ALL)
-#   define DBG_HDRS_ALL
-# endif
-
-# if defined(POINTER_MASK) && !defined(POINTER_SHIFT)
-#   define POINTER_SHIFT 0
-# endif
-
-# if defined(POINTER_SHIFT) && !defined(POINTER_MASK)
-#   define POINTER_MASK ((GC_word)(-1))
-# endif
-
-# if !defined(FIXUP_POINTER) && defined(POINTER_MASK)
-#   define FIXUP_POINTER(p) (p) = ((p) & (POINTER_MASK) << POINTER_SHIFT)
-# endif
-
-# if defined(FIXUP_POINTER)
-#   define NEED_FIXUP_POINTER 1
-# else
-#   define NEED_FIXUP_POINTER 0
-#   define FIXUP_POINTER(p)
-# endif
-
-#ifdef GC_PRIVATE_H
-	/* This relies on some type definitions from gc_priv.h, from	*/
-        /* where it's normally included.				*/
-	/*								*/
-	/* How to get heap memory from the OS:				*/
-	/* Note that sbrk()-like allocation is preferred, since it 	*/
-	/* usually makes it possible to merge consecutively allocated	*/
-	/* chunks.  It also avoids unintented recursion with		*/
-	/* -DREDIRECT_MALLOC.						*/
-	/* GET_MEM() returns a HLKSIZE aligned chunk.			*/
-	/* 0 is taken to mean failure. 					*/
-	/* In the case os USE_MMAP, the argument must also be a 	*/
-	/* physical page size.						*/
-	/* GET_MEM is currently not assumed to retrieve 0 filled space, */
-	/* though we should perhaps take advantage of the case in which */
-	/* does.							*/
-	struct hblk;	/* See gc_priv.h.	*/
-# ifdef PCR
-	    char * real_malloc();
-#   define GET_MEM(bytes) HBLKPTR(real_malloc((size_t)bytes + GC_page_size) \
-					  + GC_page_size-1)
-# else
-#   ifdef OS2
-	      void * os2_alloc(size_t bytes);
-#     define GET_MEM(bytes) HBLKPTR((ptr_t)os2_alloc((size_t)bytes \
-					    + GC_page_size) \
-					    + GC_page_size-1)
-#   else
-#     if defined(NEXT) || defined(DOS4GW) || \
-		 (defined(AMIGA) && !defined(GC_AMIGA_FASTALLOC)) || \
-		 (defined(SUNOS5) && !defined(USE_MMAP))
-#       define GET_MEM(bytes) HBLKPTR((size_t) \
-					      calloc(1, (size_t)bytes + GC_page_size) \
-					      + GC_page_size-1)
-#     else
-#	if defined(MSWIN32) || defined(CYGWIN32)
-	  extern ptr_t GC_win32_get_mem();
-#         define GET_MEM(bytes) (struct hblk *)GC_win32_get_mem(bytes)
-#	else
-#	  ifdef MACOS
-#	    if defined(USE_TEMPORARY_MEMORY)
-			extern Ptr GC_MacTemporaryNewPtr(size_t size,
-							 Boolean clearMemory);
-#               define GET_MEM(bytes) HBLKPTR( \
-			    GC_MacTemporaryNewPtr(bytes + GC_page_size, true) \
-			    + GC_page_size-1)
-#	    else
-#         	    define GET_MEM(bytes) HBLKPTR( \
-				NewPtrClear(bytes + GC_page_size) + GC_page_size-1)
-#	    endif
-#	  else
-#	    ifdef MSWINCE
-	      extern ptr_t GC_wince_get_mem();
-#	      define GET_MEM(bytes) (struct hblk *)GC_wince_get_mem(bytes)
-#	    else
-#	      if defined(AMIGA) && defined(GC_AMIGA_FASTALLOC)
-			extern void *GC_amiga_get_mem(size_t size);
-#		define GET_MEM(bytes) HBLKPTR((size_t) \
-			  GC_amiga_get_mem((size_t)bytes + GC_page_size) \
-			  + GC_page_size-1)
-#	      else
-		extern ptr_t GC_unix_get_mem();
-#               define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
-#	      endif
-#	    endif
-#	  endif
-#	endif
-#     endif
-#   endif
-# endif
-
-#endif /* GC_PRIVATE_H */
-
-#if defined(_AIX) && !defined(__GNUC__) && !defined(__STDC__)
-  /* IBMs xlc compiler doesn't appear to follow the convention of	*/
-  /* defining  __STDC__ to be zero in extended mode.			*/
-#   define __STDC__ 0
-#endif
-
-# endif /* GCCONFIG_H */
diff --git a/boehm-gc/include/private/pthread_stop_world.h b/boehm-gc/include/private/pthread_stop_world.h
deleted file mode 100644
index 6f9197a1f6f..00000000000
--- a/boehm-gc/include/private/pthread_stop_world.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GC_PTHREAD_STOP_WORLD_H
-#define GC_PTHREAD_STOP_WORLD_H
-
-struct thread_stop_info {
-    word last_stop_count;	/* GC_last_stop_count value when thread	*/
-    				/* last successfully handled a suspend	*/
-    				/* signal.				*/
-    ptr_t stack_ptr;  		/* Valid only when stopped.      	*/
-};
-    
-#endif
diff --git a/boehm-gc/include/private/pthread_support.h b/boehm-gc/include/private/pthread_support.h
deleted file mode 100644
index 2186c079039..00000000000
--- a/boehm-gc/include/private/pthread_support.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef GC_PTHREAD_SUPPORT_H
-#define GC_PTHREAD_SUPPORT_H
-
-# include "private/gc_priv.h"
-
-# if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-     && !defined(GC_WIN32_THREADS)
-     
-#if defined(GC_DARWIN_THREADS)
-# include "private/darwin_stop_world.h"
-#else
-# include "private/pthread_stop_world.h"
-#endif
-
-/* We use the allocation lock to protect thread-related data structures. */
-
-/* The set of all known threads.  We intercept thread creation and 	*/
-/* joins.								*/
-/* Protected by allocation/GC lock.					*/
-/* Some of this should be declared volatile, but that's inconsistent	*/
-/* with some library routine declarations.  		 		*/
-typedef struct GC_Thread_Rep {
-    struct GC_Thread_Rep * next;  /* More recently allocated threads	*/
-				  /* with a given pthread id come 	*/
-				  /* first.  (All but the first are	*/
-				  /* guaranteed to be dead, but we may  */
-				  /* not yet have registered the join.) */
-    pthread_t id;
-    /* Extra bookkeeping information the stopping code uses */
-    struct thread_stop_info stop_info;
-    
-    short flags;
-#	define FINISHED 1   	/* Thread has exited.	*/
-#	define DETACHED 2	/* Thread is intended to be detached.	*/
-#	define MAIN_THREAD 4	/* True for the original thread only.	*/
-#       define SUSPENDED 8      /* True if thread was suspended externally */
-    short thread_blocked;	/* Protected by GC lock.		*/
-    				/* Treated as a boolean value.  If set,	*/
-    				/* thread will acquire GC lock before	*/
-    				/* doing any pointer manipulations, and	*/
-    				/* has set its sp value.  Thus it does	*/
-    				/* not need to be sent a signal to stop	*/
-    				/* it.					*/
-    ptr_t stack_end;		/* Cold end of the stack.		*/
-#   ifdef IA64
-	ptr_t backing_store_end;
-	ptr_t backing_store_ptr;
-#   endif
-    void * status;		/* The value returned from the thread.  */
-    				/* Used only to avoid premature 	*/
-				/* reclamation of any data it might 	*/
-				/* reference.				*/
-#   ifdef THREAD_LOCAL_ALLOC
-#	if CPP_WORDSZ == 64 && defined(ALIGN_DOUBLE)
-#	    define GRANULARITY 16
-#	    define NFREELISTS 49
-#	else
-#	    define GRANULARITY 8
-#	    define NFREELISTS 65
-#	endif
-	/* The ith free list corresponds to size i*GRANULARITY */
-#	define INDEX_FROM_BYTES(n) ((ADD_SLOP(n) + GRANULARITY - 1)/GRANULARITY)
-#	define BYTES_FROM_INDEX(i) ((i) * GRANULARITY - EXTRA_BYTES)
-#	define SMALL_ENOUGH(bytes) (ADD_SLOP(bytes) <= \
-				    (NFREELISTS-1)*GRANULARITY)
-	ptr_t ptrfree_freelists[NFREELISTS];
-	ptr_t normal_freelists[NFREELISTS];
-#	ifdef GC_GCJ_SUPPORT
-	  ptr_t gcj_freelists[NFREELISTS];
-#	endif
-		/* Free lists contain either a pointer or a small count */
-		/* reflecting the number of granules allocated at that	*/
-		/* size.						*/
-		/* 0 ==> thread-local allocation in use, free list	*/
-		/*       empty.						*/
-		/* > 0, <= DIRECT_GRANULES ==> Using global allocation,	*/
-		/*       too few objects of this size have been		*/
-		/* 	 allocated by this thread.			*/
-		/* >= HBLKSIZE  => pointer to nonempty free list.	*/
-		/* > DIRECT_GRANULES, < HBLKSIZE ==> transition to	*/
-		/*    local alloc, equivalent to 0.			*/
-#	define DIRECT_GRANULES (HBLKSIZE/GRANULARITY)
-		/* Don't use local free lists for up to this much 	*/
-		/* allocation.						*/
-#   endif
-} * GC_thread;
-
-# define THREAD_TABLE_SZ 128	/* Must be power of 2	*/
-extern volatile GC_thread GC_threads[THREAD_TABLE_SZ];
-
-extern GC_bool GC_thr_initialized;
-
-GC_thread GC_lookup_thread(pthread_t id);
-
-void GC_stop_init();
-
-extern GC_bool GC_in_thread_creation;
-	/* We may currently be in thread creation or destruction.	*/
-	/* Only set to TRUE while allocation lock is held.		*/
-	/* When set, it is OK to run GC from unknown thread.		*/
-
-#endif /* GC_PTHREADS && !GC_SOLARIS_THREADS.... etc */
-#endif /* GC_PTHREAD_SUPPORT_H */
diff --git a/boehm-gc/include/private/specific.h b/boehm-gc/include/private/specific.h
deleted file mode 100644
index d04e19f5a4b..00000000000
--- a/boehm-gc/include/private/specific.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * This is a reimplementation of a subset of the pthread_getspecific/setspecific
- * interface. This appears to outperform the standard linuxthreads one
- * by a significant margin.
- * The major restriction is that each thread may only make a single
- * pthread_setspecific call on a single key.  (The current data structure
- * doesn't really require that.  The restriction should be easily removable.)
- * We don't currently support the destruction functions, though that
- * could be done.
- * We also currently assume that only one pthread_setspecific call
- * can be executed at a time, though that assumption would be easy to remove
- * by adding a lock.
- */
-
-#include <errno.h>
-
-/* Called during key creation or setspecific.		*/
-/* For the GC we already hold lock.			*/
-/* Currently allocated objects leak on thread exit.	*/
-/* That's hard to fix, but OK if we allocate garbage	*/
-/* collected memory.					*/
-#define MALLOC_CLEAR(n) GC_INTERNAL_MALLOC(n, NORMAL)
-#define PREFIXED(name) GC_##name
-
-#define TS_CACHE_SIZE 1024
-#define CACHE_HASH(n) (((((long)n) >> 8) ^ (long)n) & (TS_CACHE_SIZE - 1))
-#define TS_HASH_SIZE 1024
-#define HASH(n) (((((long)n) >> 8) ^ (long)n) & (TS_HASH_SIZE - 1))
-
-/* An entry describing a thread-specific value for a given thread.	*/
-/* All such accessible structures preserve the invariant that if either	*/
-/* thread is a valid pthread id or qtid is a valid "quick tread id"	*/
-/* for a thread, then value holds the corresponding thread specific	*/
-/* value.  This invariant must be preserved at ALL times, since		*/
-/* asynchronous reads are allowed.					*/
-typedef struct thread_specific_entry {
-	unsigned long qtid;	/* quick thread id, only for cache */
-	void * value;
-	struct thread_specific_entry *next;
-	pthread_t thread;
-} tse;
-
-
-/* We represent each thread-specific datum as two tables.  The first is	*/
-/* a cache, indexed by a "quick thread identifier".  The "quick" thread	*/
-/* identifier is an easy to compute value, which is guaranteed to	*/
-/* determine the thread, though a thread may correspond to more than	*/
-/* one value.  We typically use the address of a page in the stack.	*/
-/* The second is a hash table, indexed by pthread_self().  It is used	*/
-/* only as a backup.							*/
-
-/* Return the "quick thread id".  Default version.  Assumes page size,	*/
-/* or at least thread stack separation, is at least 4K.			*/
-/* Must be defined so that it never returns 0.  (Page 0 can't really	*/
-/* be part of any stack, since that would make 0 a valid stack pointer.)*/
-static __inline__ unsigned long quick_thread_id() {
-    int dummy;
-    return (unsigned long)(&dummy) >> 12;
-}
-
-#define INVALID_QTID ((unsigned long)0)
-#define INVALID_THREADID ((pthread_t)0)
-
-typedef struct thread_specific_data {
-    tse * volatile cache[TS_CACHE_SIZE];
-			/* A faster index to the hash table */
-    tse * hash[TS_HASH_SIZE];
-    pthread_mutex_t lock;
-} tsd;
-
-typedef tsd * PREFIXED(key_t);
-
-extern int PREFIXED(key_create) (tsd ** key_ptr, void (* destructor)(void *));
-
-extern int PREFIXED(setspecific) (tsd * key, void * value);
-
-extern void PREFIXED(remove_specific) (tsd * key);
-
-/* An internal version of getspecific that assumes a cache miss.	*/
-void * PREFIXED(slow_getspecific) (tsd * key, unsigned long qtid,
-				   tse * volatile * cache_entry);
-
-static __inline__ void * PREFIXED(getspecific) (tsd * key) {
-    long qtid = quick_thread_id();
-    unsigned hash_val = CACHE_HASH(qtid);
-    tse * volatile * entry_ptr = key -> cache + hash_val;
-    tse * entry = *entry_ptr;   /* Must be loaded only once.	*/
-    if (EXPECT(entry -> qtid == qtid, 1)) {
-      GC_ASSERT(entry -> thread == pthread_self());
-      return entry -> value;
-    }
-    return PREFIXED(slow_getspecific) (key, qtid, entry_ptr);
-}
-
-
diff --git a/boehm-gc/include/weakpointer.h b/boehm-gc/include/weakpointer.h
deleted file mode 100644
index 84906b00a68..00000000000
--- a/boehm-gc/include/weakpointer.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef	_weakpointer_h_
-#define	_weakpointer_h_
-
-/****************************************************************************
-
-WeakPointer and CleanUp
-
-    Copyright (c) 1991 by Xerox Corporation.  All rights reserved.
-
-    THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-    OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-
-    Permission is hereby granted to copy this code for any purpose,
-    provided the above notices are retained on all copies.
-
-    Last modified on Mon Jul 17 18:16:01 PDT 1995 by ellis
-
-****************************************************************************/
-
-/****************************************************************************
-
-WeakPointer
-
-A weak pointer is a pointer to a heap-allocated object that doesn't
-prevent the object from being garbage collected. Weak pointers can be
-used to track which objects haven't yet been reclaimed by the
-collector. A weak pointer is deactivated when the collector discovers
-its referent object is unreachable by normal pointers (reachability
-and deactivation are defined more precisely below). A deactivated weak
-pointer remains deactivated forever.
-
-****************************************************************************/
-
-
-template< class T > class WeakPointer {
-public:
-
-WeakPointer( T* t = 0 )
-    /* Constructs a weak pointer for *t. t may be null. It is an error
-       if t is non-null and *t is not a collected object. */
-    {impl = _WeakPointer_New( t );}
-
-T* Pointer()
-    /* wp.Pointer() returns a pointer to the referent object of wp or
-       null if wp has been deactivated (because its referent object
-       has been discovered unreachable by the collector). */
-    {return (T*) _WeakPointer_Pointer( this->impl );}
-
-int operator==( WeakPointer< T > wp2 )
-    /* Given weak pointers wp1 and wp2, if wp1 == wp2, then wp1 and
-       wp2 refer to the same object. If wp1 != wp2, then either wp1
-       and wp2 don't refer to the same object, or if they do, one or
-       both of them has been deactivated. (Note: If objects t1 and t2
-       are never made reachable by their clean-up functions, then
-       WeakPointer<T>(t1) == WeakPointer<T>(t2) if and only t1 == t2.) */
-    {return _WeakPointer_Equal( this->impl, wp2.impl );}
-
-int Hash()
-    /* Returns a hash code suitable for use by multiplicative- and
-       division-based hash tables. If wp1 == wp2, then wp1.Hash() ==
-       wp2.Hash(). */
-    {return _WeakPointer_Hash( this->impl );}
-
-private:
-void* impl;
-};
-
-/*****************************************************************************
-
-CleanUp
-
-A garbage-collected object can have an associated clean-up function
-that will be invoked some time after the collector discovers the
-object is unreachable via normal pointers. Clean-up functions can be
-used to release resources such as open-file handles or window handles
-when their containing objects become unreachable.  If a C++ object has
-a non-empty explicit destructor (i.e. it contains programmer-written
-code), the destructor will be automatically registered as the object's
-initial clean-up function.
-
-There is no guarantee that the collector will detect every unreachable
-object (though it will find almost all of them). Clients should not
-rely on clean-up to cause some action to occur immediately -- clean-up
-is only a mechanism for improving resource usage.
-
-Every object with a clean-up function also has a clean-up queue. When
-the collector finds the object is unreachable, it enqueues it on its
-queue. The clean-up function is applied when the object is removed
-from the queue. By default, objects are enqueued on the garbage
-collector's queue, and the collector removes all objects from its
-queue after each collection. If a client supplies another queue for
-objects, it is his responsibility to remove objects (and cause their
-functions to be called) by polling it periodically.
-
-Clean-up queues allow clean-up functions accessing global data to
-synchronize with the main program. Garbage collection can occur at any
-time, and clean-ups invoked by the collector might access data in an
-inconsistent state. A client can control this by defining an explicit
-queue for objects and polling it at safe points.
-
-The following definitions are used by the specification below:
-
-Given a pointer t to a collected object, the base object BO(t) is the
-value returned by new when it created the object. (Because of multiple
-inheritance, t and BO(t) may not be the same address.)
-
-A weak pointer wp references an object *t if BO(wp.Pointer()) ==
-BO(t).
-
-***************************************************************************/
-
-template< class T, class Data > class CleanUp {
-public:
-
-static void Set( T* t, void c( Data* d, T* t ), Data* d = 0 )
-    /* Sets the clean-up function of object BO(t) to be <c, d>,
-       replacing any previously defined clean-up function for BO(t); c
-       and d can be null, but t cannot. Sets the clean-up queue for
-       BO(t) to be the collector's queue. When t is removed from its
-       clean-up queue, its clean-up will be applied by calling c(d,
-       t). It is an error if *t is not a collected object. */ 
-       {_CleanUp_Set( t, c, d );}
-
-static void Call( T* t )
-    /* Sets the new clean-up function for BO(t) to be null and, if the
-       old one is non-null, calls it immediately, even if BO(t) is
-       still reachable. Deactivates any weak pointers to BO(t). */
-       {_CleanUp_Call( t );}
-
-class Queue {public:
-    Queue()
-        /* Constructs a new queue. */
-            {this->head = _CleanUp_Queue_NewHead();}
-
-    void Set( T* t )
-        /* q.Set(t) sets the clean-up queue of BO(t) to be q. */
-            {_CleanUp_Queue_Set( this->head, t );}
-
-    int Call()
-        /* If q is non-empty, q.Call() removes the first object and
-           calls its clean-up function; does nothing if q is
-           empty. Returns true if there are more objects in the
-           queue. */
-           {return _CleanUp_Queue_Call( this->head );}
-
-    private:
-    void* head;
-    };
-};
-
-/**********************************************************************
-
-Reachability and Clean-up
-
-An object O is reachable if it can be reached via a non-empty path of
-normal pointers from the registers, stacks, global variables, or an
-object with a non-null clean-up function (including O itself),
-ignoring pointers from an object to itself.
-
-This definition of reachability ensures that if object B is accessible
-from object A (and not vice versa) and if both A and B have clean-up
-functions, then A will always be cleaned up before B. Note that as
-long as an object with a clean-up function is contained in a cycle of
-pointers, it will always be reachable and will never be cleaned up or
-collected.
-
-When the collector finds an unreachable object with a null clean-up
-function, it atomically deactivates all weak pointers referencing the
-object and recycles its storage. If object B is accessible from object
-A via a path of normal pointers, A will be discovered unreachable no
-later than B, and a weak pointer to A will be deactivated no later
-than a weak pointer to B.
-
-When the collector finds an unreachable object with a non-null
-clean-up function, the collector atomically deactivates all weak
-pointers referencing the object, redefines its clean-up function to be
-null, and enqueues it on its clean-up queue. The object then becomes
-reachable again and remains reachable at least until its clean-up
-function executes.
-
-The clean-up function is assured that its argument is the only
-accessible pointer to the object. Nothing prevents the function from
-redefining the object's clean-up function or making the object
-reachable again (for example, by storing the pointer in a global
-variable).
-
-If the clean-up function does not make its object reachable again and
-does not redefine its clean-up function, then the object will be
-collected by a subsequent collection (because the object remains
-unreachable and now has a null clean-up function). If the clean-up
-function does make its object reachable again and a clean-up function
-is subsequently redefined for the object, then the new clean-up
-function will be invoked the next time the collector finds the object
-unreachable.
-
-Note that a destructor for a collected object cannot safely redefine a
-clean-up function for its object, since after the destructor executes,
-the object has been destroyed into "raw memory". (In most
-implementations, destroying an object mutates its vtbl.)
-
-Finally, note that calling delete t on a collected object first
-deactivates any weak pointers to t and then invokes its clean-up
-function (destructor).
-
-**********************************************************************/
-
-extern "C" {
-    void* _WeakPointer_New( void* t );
-    void* _WeakPointer_Pointer( void* wp );
-    int _WeakPointer_Equal( void* wp1, void* wp2 );
-    int _WeakPointer_Hash( void* wp );
-    void _CleanUp_Set( void* t, void (*c)( void* d, void* t ), void* d );
-    void _CleanUp_Call( void* t );
-    void* _CleanUp_Queue_NewHead ();
-    void _CleanUp_Queue_Set( void* h, void* t );
-    int _CleanUp_Queue_Call( void* h );
-}
-
-#endif /* _weakpointer_h_ */
-
-
diff --git a/boehm-gc/mach_dep.c b/boehm-gc/mach_dep.c
deleted file mode 100644
index ba1e0b6fe50..00000000000
--- a/boehm-gc/mach_dep.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, November 17, 1995 12:13 pm PST */
-# include "private/gc_priv.h"
-# include <stdio.h>
-# include <setjmp.h>
-# if defined(OS2) || defined(CX_UX)
-#   define _setjmp(b) setjmp(b)
-#   define _longjmp(b,v) longjmp(b,v)
-# endif
-# ifdef AMIGA
-#   ifndef __GNUC__
-#     include <dos.h>
-#   else
-#     include <machine/reg.h>
-#   endif
-# endif
-
-#if defined(RS6000) || defined(POWERPC)
-# include <ucontext.h>
-#endif
-
-#if defined(__MWERKS__) && !defined(POWERPC)
-
-asm static void PushMacRegisters()
-{
-    sub.w   #4,sp                   // reserve space for one parameter.
-    move.l  a2,(sp)
-    jsr		GC_push_one
-    move.l  a3,(sp)
-    jsr		GC_push_one
-    move.l  a4,(sp)
-    jsr		GC_push_one
-#   if !__option(a6frames)
-	// <pcb> perhaps a6 should be pushed if stack frames are not being used.    
-  	move.l	a6,(sp)
-  	jsr		GC_push_one
-#   endif
-	// skip a5 (globals), a6 (frame pointer), and a7 (stack pointer)
-    move.l  d2,(sp)
-    jsr		GC_push_one
-    move.l  d3,(sp)
-    jsr		GC_push_one
-    move.l  d4,(sp)
-    jsr		GC_push_one
-    move.l  d5,(sp)
-    jsr		GC_push_one
-    move.l  d6,(sp)
-    jsr		GC_push_one
-    move.l  d7,(sp)
-    jsr		GC_push_one
-    add.w   #4,sp                   // fix stack.
-    rts
-}
-
-#endif /* __MWERKS__ */
-
-# if defined(SPARC) || defined(IA64)
-    /* Value returned from register flushing routine; either sp (SPARC) */
-    /* or ar.bsp (IA64)							*/
-    word GC_save_regs_ret_val;
-# endif
-
-/* Routine to mark from registers that are preserved by the C compiler. */
-/* This must be ported to every new architecture.  There is a generic   */
-/* version at the end, that is likely, but not guaranteed to work       */
-/* on your architecture.  Run the test_setjmp program to see whether    */
-/* there is any chance it will work.                                    */
-
-#if !defined(USE_GENERIC_PUSH_REGS) && !defined(USE_ASM_PUSH_REGS)
-#undef HAVE_PUSH_REGS
-void GC_push_regs()
-{
-#       ifdef RT
-	  register long TMP_SP; /* must be bound to r11 */
-#       endif
-
-#       ifdef VAX
-	  /* VAX - generic code below does not work under 4.2 */
-	  /* r1 through r5 are caller save, and therefore     */
-	  /* on the stack or dead.                            */
-	  asm("pushl r11");     asm("calls $1,_GC_push_one");
-	  asm("pushl r10"); 	asm("calls $1,_GC_push_one");
-	  asm("pushl r9");	asm("calls $1,_GC_push_one");
-	  asm("pushl r8");	asm("calls $1,_GC_push_one");
-	  asm("pushl r7");	asm("calls $1,_GC_push_one");
-	  asm("pushl r6");	asm("calls $1,_GC_push_one");
-#	  define HAVE_PUSH_REGS
-#       endif
-#       if defined(M68K) && (defined(SUNOS4) || defined(NEXT))
-	/*  M68K SUNOS - could be replaced by generic code */
-	  /* a0, a1 and d1 are caller save          */
-	  /*  and therefore are on stack or dead.   */
-	
-	  asm("subqw #0x4,sp");		/* allocate word on top of stack */
-
-	  asm("movl a2,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl a3,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl a4,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl a5,sp@");	asm("jbsr _GC_push_one");
-	  /* Skip frame pointer and stack pointer */
-	  asm("movl d1,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d2,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d3,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d4,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d5,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d6,sp@");	asm("jbsr _GC_push_one");
-	  asm("movl d7,sp@");	asm("jbsr _GC_push_one");
-
-	  asm("addqw #0x4,sp");		/* put stack back where it was	*/
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#       if defined(M68K) && defined(HP)
-	/*  M68K HP - could be replaced by generic code */
-	  /* a0, a1 and d1 are caller save.  */
-	
-	  asm("subq.w &0x4,%sp");	/* allocate word on top of stack */
-
-	  asm("mov.l %a2,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a3,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a4,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a5,(%sp)"); asm("jsr _GC_push_one");
-	  /* Skip frame pointer and stack pointer */
-	  asm("mov.l %d1,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d2,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d3,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d4,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d5,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d6,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d7,(%sp)"); asm("jsr _GC_push_one");
-
-	  asm("addq.w &0x4,%sp");	/* put stack back where it was	*/
-#	  define HAVE_PUSH_REGS
-#       endif /* M68K HP */
-
-#	if defined(M68K) && defined(AMIGA)
- 	 /*  AMIGA - could be replaced by generic code 			*/
- 	 /* a0, a1, d0 and d1 are caller save */
-
-#        ifdef __GNUC__
-	  asm("subq.w &0x4,%sp");	/* allocate word on top of stack */
-
-	  asm("mov.l %a2,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a3,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a4,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a5,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %a6,(%sp)"); asm("jsr _GC_push_one");
-	  /* Skip frame pointer and stack pointer */
-	  asm("mov.l %d2,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d3,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d4,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d5,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d6,(%sp)"); asm("jsr _GC_push_one");
-	  asm("mov.l %d7,(%sp)"); asm("jsr _GC_push_one");
-
-	  asm("addq.w &0x4,%sp");	/* put stack back where it was	*/
-#	  define HAVE_PUSH_REGS
-#        else /* !__GNUC__ */
-	  GC_push_one(getreg(REG_A2));
-	  GC_push_one(getreg(REG_A3));
-#         ifndef __SASC
-	      /* Can probably be changed to #if 0 -Kjetil M. (a4=globals)*/
-	    GC_push_one(getreg(REG_A4));
-#	  endif
-	  GC_push_one(getreg(REG_A5));
-	  GC_push_one(getreg(REG_A6));
-	  /* Skip stack pointer */
-	  GC_push_one(getreg(REG_D2));
-	  GC_push_one(getreg(REG_D3));
-	  GC_push_one(getreg(REG_D4));
-	  GC_push_one(getreg(REG_D5));
-	  GC_push_one(getreg(REG_D6));
-	  GC_push_one(getreg(REG_D7));
-#	  define HAVE_PUSH_REGS
-#	 endif /* !__GNUC__ */
-#       endif /* AMIGA */
-
-#	if defined(M68K) && defined(MACOS)
-#	if defined(THINK_C)
-#         define PushMacReg(reg) \
-              move.l  reg,(sp) \
-              jsr             GC_push_one
-	  asm {
-              sub.w   #4,sp                   ; reserve space for one parameter.
-              PushMacReg(a2);
-              PushMacReg(a3);
-              PushMacReg(a4);
-              ; skip a5 (globals), a6 (frame pointer), and a7 (stack pointer)
-              PushMacReg(d2);
-              PushMacReg(d3);
-              PushMacReg(d4);
-              PushMacReg(d5);
-              PushMacReg(d6);
-              PushMacReg(d7);
-              add.w   #4,sp                   ; fix stack.
-	  }
-#	  define HAVE_PUSH_REGS
-#	  undef PushMacReg
-#	endif /* THINK_C */
-#	if defined(__MWERKS__)
-	  PushMacRegisters();
-#	  define HAVE_PUSH_REGS
-#	endif	/* __MWERKS__ */
-#   endif	/* MACOS */
-
-#       if defined(I386) &&!defined(OS2) &&!defined(SVR4) \
-	&& (defined(__MINGW32__) || !defined(MSWIN32)) \
-	&& !defined(SCO) && !defined(SCO_ELF) \
- 	&& !(defined(LINUX) && defined(__ELF__)) \
-	&& !(defined(FREEBSD) && defined(__ELF__)) \
-	&& !(defined(NETBSD) && defined(__ELF__)) \
-	&& !(defined(OPENBSD) && defined(__ELF__)) \
-	&& !(defined(BEOS) && defined(__ELF__)) \
-	&& !defined(DOS4GW) && !defined(HURD)
-	/* I386 code, generic code does not appear to work */
-	/* It does appear to work under OS2, and asms dont */
-	/* This is used for some 38g UNIX variants and for CYGWIN32 */
-	  asm("pushl %eax");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ecx");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %edx");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ebp");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %esi");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %edi");  asm("call _GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ebx");  asm("call _GC_push_one"); asm("addl $4,%esp");
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#	if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
-	|| ( defined(I386) && defined(FREEBSD) && defined(__ELF__) ) \
-	|| ( defined(I386) && defined(NETBSD) && defined(__ELF__) ) \
-	|| ( defined(I386) && defined(OPENBSD) && defined(__ELF__) ) \
-	|| ( defined(I386) && defined(HURD) && defined(__ELF__) ) \
-	|| ( defined(I386) && defined(DGUX) )
-
-	/* This is modified for Linux with ELF (Note: _ELF_ only) */
-	/* This section handles FreeBSD with ELF. */
-	/* Eax is caller-save and dead here.  Other caller-save 	*/
-	/* registers could also be skipped.  We assume there are no	*/
-	/* pointers in MMX registers, etc.				*/
-	/* We combine instructions in a single asm to prevent gcc from 	*/
-	/* inserting code in the middle.				*/
-	  asm("pushl %ecx; call GC_push_one; addl $4,%esp");
-	  asm("pushl %edx; call GC_push_one; addl $4,%esp");
-	  asm("pushl %ebp; call GC_push_one; addl $4,%esp");
-	  asm("pushl %esi; call GC_push_one; addl $4,%esp");
-	  asm("pushl %edi; call GC_push_one; addl $4,%esp");
-	  asm("pushl %ebx; call GC_push_one; addl $4,%esp");
-#	  define HAVE_PUSH_REGS
-#	endif
-
-#	if ( defined(I386) && defined(BEOS) && defined(__ELF__) )
-	/* As far as I can understand from				*/
-	/* http://www.beunited.org/articles/jbq/nasm.shtml,		*/
-	/* only ebp, esi, edi and ebx are not scratch. How MMX 		*/
-	/* etc. registers should be treated, I have no idea. 		*/
-	  asm("pushl %ebp; call GC_push_one; addl $4,%esp");
-	  asm("pushl %esi; call GC_push_one; addl $4,%esp");
-	  asm("pushl %edi; call GC_push_one; addl $4,%esp");
-	  asm("pushl %ebx; call GC_push_one; addl $4,%esp");
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#       if defined(I386) && defined(MSWIN32) && !defined(__MINGW32__) \
-	   && !defined(USE_GENERIC)
-	/* I386 code, Microsoft variant		*/
-	  __asm  push eax
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push ebx
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push ecx
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push edx
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push ebp
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push esi
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-	  __asm  push edi
-	  __asm  call GC_push_one
-	  __asm  add esp,4
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#       if defined(I386) && (defined(SVR4) || defined(SCO) || defined(SCO_ELF))
-	/* I386 code, SVR4 variant, generic code does not appear to work */
-	  asm("pushl %eax");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ebx");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ecx");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %edx");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %ebp");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %esi");  asm("call GC_push_one"); asm("addl $4,%esp");
-	  asm("pushl %edi");  asm("call GC_push_one"); asm("addl $4,%esp");
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#       ifdef NS32K
-	  asm ("movd r3, tos"); asm ("bsr ?_GC_push_one"); asm ("adjspb $-4");
-	  asm ("movd r4, tos"); asm ("bsr ?_GC_push_one"); asm ("adjspb $-4");
-	  asm ("movd r5, tos"); asm ("bsr ?_GC_push_one"); asm ("adjspb $-4");
-	  asm ("movd r6, tos"); asm ("bsr ?_GC_push_one"); asm ("adjspb $-4");
-	  asm ("movd r7, tos"); asm ("bsr ?_GC_push_one"); asm ("adjspb $-4");
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#       if defined(SPARC)
-	  GC_save_regs_ret_val = GC_save_regs_in_stack();
-#	  define HAVE_PUSH_REGS
-#       endif
-
-#	ifdef RT
-	    GC_push_one(TMP_SP);    /* GC_push_one from r11 */
-
-	    asm("cas r11, r6, r0"); GC_push_one(TMP_SP);	/* r6 */
-	    asm("cas r11, r7, r0"); GC_push_one(TMP_SP);	/* through */
-	    asm("cas r11, r8, r0"); GC_push_one(TMP_SP);	/* r10 */
-	    asm("cas r11, r9, r0"); GC_push_one(TMP_SP);
-	    asm("cas r11, r10, r0"); GC_push_one(TMP_SP);
-
-	    asm("cas r11, r12, r0"); GC_push_one(TMP_SP); /* r12 */
-	    asm("cas r11, r13, r0"); GC_push_one(TMP_SP); /* through */
-	    asm("cas r11, r14, r0"); GC_push_one(TMP_SP); /* r15 */
-	    asm("cas r11, r15, r0"); GC_push_one(TMP_SP);
-#	    define HAVE_PUSH_REGS
-#       endif
-
-#       if defined(M68K) && defined(SYSV)
-  	/*  Once again similar to SUN and HP, though setjmp appears to work.
-  		--Parag
-  	 */
-#        ifdef __GNUC__
-  	  asm("subqw #0x4,%sp");	/* allocate word on top of stack */
-  
-  	  asm("movl %a2,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %a3,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %a4,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %a5,%sp@");	asm("jbsr GC_push_one");
-  	  /* Skip frame pointer and stack pointer */
-  	  asm("movl %d1,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d2,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d3,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d4,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d5,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d6,%sp@");	asm("jbsr GC_push_one");
-  	  asm("movl %d7,%sp@");	asm("jbsr GC_push_one");
-  
-  	  asm("addqw #0x4,%sp");	/* put stack back where it was	*/
-#	  define HAVE_PUSH_REGS
-#        else /* !__GNUC__*/
-  	  asm("subq.w &0x4,%sp");	/* allocate word on top of stack */
-  
-  	  asm("mov.l %a2,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %a3,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %a4,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %a5,(%sp)"); asm("jsr GC_push_one");
-  	  /* Skip frame pointer and stack pointer */
-  	  asm("mov.l %d1,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %d2,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %d3,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %d4,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %d5,(%sp)"); asm("jsr GC_push_one");
-   	  asm("mov.l %d6,(%sp)"); asm("jsr GC_push_one");
-  	  asm("mov.l %d7,(%sp)"); asm("jsr GC_push_one");
-  
-  	  asm("addq.w &0x4,%sp");	/* put stack back where it was	*/
-#	  define HAVE_PUSH_REGS
-#        endif /* !__GNUC__ */
-#       endif /* M68K/SYSV */
-
-#     if defined(PJ)
-	{
-	    register int * sp asm ("optop");
-	    extern int *__libc_stack_end;
-
-	    GC_push_all_stack (sp, __libc_stack_end);
-#	    define HAVE_PUSH_REGS
-	    /* Isn't this redundant with the code to push the stack? */
-        }
-#     endif
-
-      /* other machines... */
-#       if !defined(HAVE_PUSH_REGS)
-	    --> We just generated an empty GC_push_regs, which
-	    --> is almost certainly broken.  Try defining
-	    --> USE_GENERIC_PUSH_REGS instead.
-#       endif
-}
-#endif /* !USE_GENERIC_PUSH_REGS && !USE_ASM_PUSH_REGS */
-
-void GC_with_callee_saves_pushed(fn, arg)
-void (*fn)();
-ptr_t arg;
-{
-    word dummy;
-
-#   if defined(USE_GENERIC_PUSH_REGS)
-#     ifdef HAVE_BUILTIN_UNWIND_INIT
-        /* This was suggested by Richard Henderson as the way to	*/
-        /* force callee-save registers and register windows onto	*/
-        /* the stack.						*/
-        __builtin_unwind_init();
-#     else /* !HAVE_BUILTIN_UNWIND_INIT */
-#      if defined(RS6000) || defined(POWERPC)
-	/* FIXME: RS6000 means AIX.				*/
-        /* This should probably be used in all Posix/non-gcc	*/
-        /* settings.  We defer that change to minimize risk.	*/
-        ucontext_t ctxt;
-        getcontext(&ctxt);
-#      else
-        /* Generic code                          */
-        /* The idea is due to Parag Patel at HP. */
-        /* We're not sure whether he would like  */
-        /* to be he acknowledged for it or not.  */
-        jmp_buf regs;
-        register word * i = (word *) regs;
-        register ptr_t lim = (ptr_t)(regs) + (sizeof regs);
-  
-        /* Setjmp doesn't always clear all of the buffer.		*/
-        /* That tends to preserve garbage.  Clear it.   		*/
-  	for (; (char *)i < lim; i++) {
-  	    *i = 0;
-  	}
-#       if defined(MSWIN32) || defined(MSWINCE) \
-                  || defined(UTS4) || defined(LINUX) || defined(EWS4800)
-  	  (void) setjmp(regs);
-#       else
-            (void) _setjmp(regs);
-  	  /* We don't want to mess with signals. According to	*/
-  	  /* SUSV3, setjmp() may or may not save signal mask.	*/
-  	  /* _setjmp won't, but is less portable.		*/
-#       endif
-#      endif /* !AIX ... */
-#     endif /* !HAVE_BUILTIN_UNWIND_INIT */
-#   else
-#     if defined(PTHREADS) && !defined(MSWIN32) /* !USE_GENERIC_PUSH_REGS */
-        /* We may still need this to save thread contexts.	*/
-        ucontext_t ctxt;
-        getcontext(&ctxt);
-#     else  /* Shouldn't be needed */
-        ABORT("Unexpected call to GC_with_callee_saves_pushed");
-#     endif
-#   endif
-#   if (defined(SPARC) && !defined(HAVE_BUILTIN_UNWIND_INIT)) \
-	|| defined(IA64)
-      /* On a register window machine, we need to save register	*/
-      /* contents on the stack for this to work.  The setjmp	*/
-      /* is probably not needed on SPARC, since pointers are	*/
-      /* only stored in windowed or scratch registers.  It is	*/
-      /* needed on IA64, since some non-windowed registers are	*/
-      /* preserved.						*/
-      {
-        GC_save_regs_ret_val = GC_save_regs_in_stack();
-	/* On IA64 gcc, could use __builtin_ia64_flushrs() and	*/
-	/* __builtin_ia64_flushrs().  The latter will be done	*/
-	/* implicitly by __builtin_unwind_init() for gcc3.0.1	*/
-	/* and later.						*/
-      }
-#   endif
-    fn(arg);
-    /* Strongly discourage the compiler from treating the above	*/
-    /* as a tail-call, since that would pop the register 	*/
-    /* contents before we get a chance to look at them.		*/
-    GC_noop1((word)(&dummy));
-}
-
-#if defined(USE_GENERIC_PUSH_REGS)
-void GC_generic_push_regs(cold_gc_frame)
-ptr_t cold_gc_frame;
-{
-    GC_with_callee_saves_pushed(GC_push_current_stack, cold_gc_frame);
-}
-#endif /* USE_GENERIC_PUSH_REGS */
-
-/* On register window machines, we need a way to force registers into 	*/
-/* the stack.	Return sp.						*/
-# ifdef SPARC
-    asm("	.seg 	\"text\"");
-#   if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
-      asm("	.globl	GC_save_regs_in_stack");
-      asm("GC_save_regs_in_stack:");
-      asm("	.type GC_save_regs_in_stack,#function");
-#   else
-      asm("	.globl	_GC_save_regs_in_stack");
-      asm("_GC_save_regs_in_stack:");
-#   endif
-#   if defined(__arch64__) || defined(__sparcv9)
-      asm("	save	%sp,-128,%sp");
-      asm("	flushw");
-      asm("	ret");
-      asm("	restore %sp,2047+128,%o0");
-#   else
-      asm("	ta	0x3   ! ST_FLUSH_WINDOWS");
-      asm("	retl");
-      asm("	mov	%sp,%o0");
-#   endif
-#   ifdef SVR4
-      asm("	.GC_save_regs_in_stack_end:");
-      asm("	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
-#   endif
-#   ifdef LINT
-	word GC_save_regs_in_stack() { return(0 /* sp really */);}
-#   endif
-# endif
-
-/* On IA64, we also need to flush register windows.  But they end	*/
-/* up on the other side of the stack segment.				*/
-/* Returns the backing store pointer for the register stack.		*/
-/* We now implement this as a separate assembly file, since inline	*/
-/* assembly code here doesn't work with either the Intel or HP 		*/
-/* compilers.								*/
-# if 0
-#   ifdef LINUX
-	asm("        .text");
-	asm("        .psr abi64");
-	asm("        .psr lsb");
-	asm("        .lsb");
-	asm("");
-	asm("        .text");
-	asm("        .align 16");
-	asm("        .global GC_save_regs_in_stack");
-	asm("        .proc GC_save_regs_in_stack");
-	asm("GC_save_regs_in_stack:");
-	asm("        .body");
-	asm("        flushrs");
-	asm("        ;;");
-	asm("        mov r8=ar.bsp");
-	asm("        br.ret.sptk.few rp");
-	asm("        .endp GC_save_regs_in_stack");
-#   endif /* LINUX */
-#   if 0 /* Other alternatives that don't work on HP/UX */
-	word GC_save_regs_in_stack() {
-#	  if USE_BUILTINS
-	    __builtin_ia64_flushrs();
-	    return __builtin_ia64_bsp();
-#	  else
-#	    ifdef HPUX
-	      _asm("        flushrs");
-	      _asm("        ;;");
-	      _asm("        mov r8=ar.bsp");
-	      _asm("        br.ret.sptk.few rp");
-#	    else
-	      asm("        flushrs");
-	      asm("        ;;");
-	      asm("        mov r8=ar.bsp");
-	      asm("        br.ret.sptk.few rp");
-#	    endif
-#	  endif
-	}
-#   endif
-# endif
-
-/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and	*/
-/* returns arg.  Stack clearing is crucial on SPARC, so we supply	*/
-/* an assembly version that's more careful.  Assumes limit is hotter	*/
-/* than sp, and limit is 8 byte aligned.				*/
-#if defined(ASM_CLEAR_CODE)
-#ifndef SPARC
-	--> fix it
-#endif
-# ifdef SUNOS4
-    asm(".globl _GC_clear_stack_inner");
-    asm("_GC_clear_stack_inner:");
-# else
-    asm(".globl GC_clear_stack_inner");
-    asm("GC_clear_stack_inner:");
-    asm(".type GC_save_regs_in_stack,#function");
-# endif
-#if defined(__arch64__) || defined(__sparcv9)
-  asm("mov %sp,%o2");		/* Save sp			*/
-  asm("add %sp,2047-8,%o3");	/* p = sp+bias-8		*/
-  asm("add %o1,-2047-192,%sp");	/* Move sp out of the way,	*/
-  				/* so that traps still work.	*/
-  				/* Includes some extra words	*/
-  				/* so we can be sloppy below.	*/
-  asm("loop:");
-  asm("stx %g0,[%o3]");		/* *(long *)p = 0		*/
-  asm("cmp %o3,%o1");
-  asm("bgu,pt %xcc, loop");	/* if (p > limit) goto loop	*/
-    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-  asm("retl");
-    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-#else
-  asm("mov %sp,%o2");		/* Save sp	*/
-  asm("add %sp,-8,%o3");	/* p = sp-8	*/
-  asm("clr %g1");		/* [g0,g1] = 0	*/
-  asm("add %o1,-0x60,%sp");	/* Move sp out of the way,	*/
-  				/* so that traps still work.	*/
-  				/* Includes some extra words	*/
-  				/* so we can be sloppy below.	*/
-  asm("loop:");
-  asm("std %g0,[%o3]");		/* *(long long *)p = 0	*/
-  asm("cmp %o3,%o1");
-  asm("bgu loop	");		/* if (p > limit) goto loop	*/
-    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-  asm("retl");
-    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-#endif /* old SPARC */
-  /* First argument = %o0 = return value */
-#   ifdef SVR4
-      asm("	.GC_clear_stack_inner_end:");
-      asm("	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
-#   endif
-  
-# ifdef LINT
-    /*ARGSUSED*/
-    ptr_t GC_clear_stack_inner(arg, limit)
-    ptr_t arg; word limit;
-    { return(arg); }
-# endif
-#endif  
diff --git a/boehm-gc/malloc.c b/boehm-gc/malloc.c
deleted file mode 100644
index cb3f3766386..00000000000
--- a/boehm-gc/malloc.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, February 7, 1996 4:32 pm PST */
- 
-#include <stdio.h>
-#include "private/gc_priv.h"
-
-extern ptr_t GC_clear_stack();	/* in misc.c, behaves like identity */
-void GC_extend_size_map();	/* in misc.c. */
-
-/* Allocate reclaim list for kind:	*/
-/* Return TRUE on success		*/
-GC_bool GC_alloc_reclaim_list(kind)
-register struct obj_kind * kind;
-{
-    struct hblk ** result = (struct hblk **)
-    		GC_scratch_alloc((MAXOBJSZ+1) * sizeof(struct hblk *));
-    if (result == 0) return(FALSE);
-    BZERO(result, (MAXOBJSZ+1)*sizeof(struct hblk *));
-    kind -> ok_reclaim_list = result;
-    return(TRUE);
-}
-
-/* Allocate a large block of size lw words.	*/
-/* The block is not cleared.			*/
-/* Flags is 0 or IGNORE_OFF_PAGE.		*/
-/* We hold the allocation lock.			*/
-ptr_t GC_alloc_large(lw, k, flags)
-word lw;
-int k;
-unsigned flags;
-{
-    struct hblk * h;
-    word n_blocks = OBJ_SZ_TO_BLOCKS(lw);
-    ptr_t result;
-	
-    if (!GC_is_initialized) GC_init_inner();
-    /* Do our share of marking work */
-        if(GC_incremental && !GC_dont_gc)
-	    GC_collect_a_little_inner((int)n_blocks);
-    h = GC_allochblk(lw, k, flags);
-#   ifdef USE_MUNMAP
-	if (0 == h) {
-	    GC_merge_unmapped();
-	    h = GC_allochblk(lw, k, flags);
-	}
-#   endif
-    while (0 == h && GC_collect_or_expand(n_blocks, (flags != 0))) {
-	h = GC_allochblk(lw, k, flags);
-    }
-    if (h == 0) {
-	result = 0;
-    } else {
-	int total_bytes = n_blocks * HBLKSIZE;
-	if (n_blocks > 1) {
-	    GC_large_allocd_bytes += total_bytes;
-	    if (GC_large_allocd_bytes > GC_max_large_allocd_bytes)
-	        GC_max_large_allocd_bytes = GC_large_allocd_bytes;
-	}
-	result = (ptr_t) (h -> hb_body);
-	GC_words_wasted += BYTES_TO_WORDS(total_bytes) - lw;
-    }
-    return result;
-}
-
-
-/* Allocate a large block of size lb bytes.  Clear if appropriate.	*/
-/* We hold the allocation lock.						*/
-ptr_t GC_alloc_large_and_clear(lw, k, flags)
-word lw;
-int k;
-unsigned flags;
-{
-    ptr_t result = GC_alloc_large(lw, k, flags);
-    word n_blocks = OBJ_SZ_TO_BLOCKS(lw);
-
-    if (0 == result) return 0;
-    if (GC_debugging_started || GC_obj_kinds[k].ok_init) {
-	/* Clear the whole block, in case of GC_realloc call. */
-	BZERO(result, n_blocks * HBLKSIZE);
-    }
-    return result;
-}
-
-/* allocate lb bytes for an object of kind k.	*/
-/* Should not be used to directly to allocate	*/
-/* objects such as STUBBORN objects that	*/
-/* require special handling on allocation.	*/
-/* First a version that assumes we already	*/
-/* hold lock:					*/
-ptr_t GC_generic_malloc_inner(lb, k)
-register word lb;
-register int k;
-{
-register word lw;
-register ptr_t op;
-register ptr_t *opp;
-
-    if( SMALL_OBJ(lb) ) {
-        register struct obj_kind * kind = GC_obj_kinds + k;
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-	  if (lw == 0) lw = MIN_WORDS;
-#       endif
-	opp = &(kind -> ok_freelist[lw]);
-        if( (op = *opp) == 0 ) {
-#	    ifdef MERGE_SIZES
-	      if (GC_size_map[lb] == 0) {
-	        if (!GC_is_initialized)  GC_init_inner();
-	        if (GC_size_map[lb] == 0) GC_extend_size_map(lb);
-	        return(GC_generic_malloc_inner(lb, k));
-	      }
-#	    else
-	      if (!GC_is_initialized) {
-	        GC_init_inner();
-	        return(GC_generic_malloc_inner(lb, k));
-	      }
-#	    endif
-	    if (kind -> ok_reclaim_list == 0) {
-	    	if (!GC_alloc_reclaim_list(kind)) goto out;
-	    }
-	    op = GC_allocobj(lw, k);
-	    if (op == 0) goto out;
-        }
-        /* Here everything is in a consistent state.	*/
-        /* We assume the following assignment is	*/
-        /* atomic.  If we get aborted			*/
-        /* after the assignment, we lose an object,	*/
-        /* but that's benign.				*/
-        /* Volatile declarations may need to be added	*/
-        /* to prevent the compiler from breaking things.*/
-	/* If we only execute the second of the 	*/
-	/* following assignments, we lose the free	*/
-	/* list, but that should still be OK, at least	*/
-	/* for garbage collected memory.		*/
-        *opp = obj_link(op);
-        obj_link(op) = 0;
-    } else {
-	lw = ROUNDED_UP_WORDS(lb);
-	op = (ptr_t)GC_alloc_large_and_clear(lw, k, 0);
-    }
-    GC_words_allocd += lw;
-    
-out:
-    return op;
-}
-
-/* Allocate a composite object of size n bytes.  The caller guarantees  */
-/* that pointers past the first page are not relevant.  Caller holds    */
-/* allocation lock.                                                     */
-ptr_t GC_generic_malloc_inner_ignore_off_page(lb, k)
-register size_t lb;
-register int k;
-{
-    register word lw;
-    ptr_t op;
-
-    if (lb <= HBLKSIZE)
-        return(GC_generic_malloc_inner((word)lb, k));
-    lw = ROUNDED_UP_WORDS(lb);
-    op = (ptr_t)GC_alloc_large_and_clear(lw, k, IGNORE_OFF_PAGE);
-    GC_words_allocd += lw;
-    return op;
-}
-
-ptr_t GC_generic_malloc(lb, k)
-register word lb;
-register int k;
-{
-    ptr_t result;
-    DCL_LOCK_STATE;
-
-    if (GC_have_errors) GC_print_all_errors();
-    GC_INVOKE_FINALIZERS();
-    if (SMALL_OBJ(lb)) {
-    	DISABLE_SIGNALS();
-	LOCK();
-        result = GC_generic_malloc_inner((word)lb, k);
-	UNLOCK();
-	ENABLE_SIGNALS();
-    } else {
-	word lw;
-	word n_blocks;
-	GC_bool init;
-	lw = ROUNDED_UP_WORDS(lb);
-	n_blocks = OBJ_SZ_TO_BLOCKS(lw);
-	init = GC_obj_kinds[k].ok_init;
-	DISABLE_SIGNALS();
-	LOCK();
-	result = (ptr_t)GC_alloc_large(lw, k, 0);
-	if (0 != result) {
-	  if (GC_debugging_started) {
-	    BZERO(result, n_blocks * HBLKSIZE);
-	  } else {
-#           ifdef THREADS
-	      /* Clear any memory that might be used for GC descriptors */
-	      /* before we release the lock.			      */
-	        ((word *)result)[0] = 0;
-	        ((word *)result)[1] = 0;
-	        ((word *)result)[lw-1] = 0;
-	        ((word *)result)[lw-2] = 0;
-#	    endif
-	  }
-	}
-	GC_words_allocd += lw;
-	UNLOCK();
-	ENABLE_SIGNALS();
-    	if (init && !GC_debugging_started && 0 != result) {
-	    BZERO(result, n_blocks * HBLKSIZE);
-        }
-    }
-    if (0 == result) {
-        return((*GC_oom_fn)(lb));
-    } else {
-        return(result);
-    }
-}   
-
-
-#define GENERAL_MALLOC(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc((word)lb, k))
-/* We make the GC_clear_stack_call a tail call, hoping to get more of	*/
-/* the stack.								*/
-
-/* Allocate lb bytes of atomic (pointerfree) data */
-# ifdef __STDC__
-    GC_PTR GC_malloc_atomic(size_t lb)
-# else
-    GC_PTR GC_malloc_atomic(lb)
-    size_t lb;
-# endif
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( EXPECT(SMALL_OBJ(lb), 1) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_aobjfreelist[lw]);
-	FASTLOCK();
-        if( EXPECT(!FASTLOCK_SUCCEEDED() || (op = *opp) == 0, 0) ) {
-            FASTUNLOCK();
-            return(GENERAL_MALLOC((word)lb, PTRFREE));
-        }
-        /* See above comment on signals.	*/
-        *opp = obj_link(op);
-        GC_words_allocd += lw;
-        FASTUNLOCK();
-        return((GC_PTR) op);
-   } else {
-       return(GENERAL_MALLOC((word)lb, PTRFREE));
-   }
-}
-
-/* Allocate lb bytes of composite (pointerful) data */
-# ifdef __STDC__
-    GC_PTR GC_malloc(size_t lb)
-# else
-    GC_PTR GC_malloc(lb)
-    size_t lb;
-# endif
-{
-register ptr_t op;
-register ptr_t *opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( EXPECT(SMALL_OBJ(lb), 1) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_objfreelist[lw]);
-	FASTLOCK();
-        if( EXPECT(!FASTLOCK_SUCCEEDED() || (op = *opp) == 0, 0) ) {
-            FASTUNLOCK();
-            return(GENERAL_MALLOC((word)lb, NORMAL));
-        }
-        /* See above comment on signals.	*/
-	GC_ASSERT(0 == obj_link(op)
-		  || (word)obj_link(op)
-		  	<= (word)GC_greatest_plausible_heap_addr
-		     && (word)obj_link(op)
-		     	>= (word)GC_least_plausible_heap_addr);
-        *opp = obj_link(op);
-        obj_link(op) = 0;
-        GC_words_allocd += lw;
-        FASTUNLOCK();
-        return((GC_PTR) op);
-   } else {
-       return(GENERAL_MALLOC((word)lb, NORMAL));
-   }
-}
-
-# ifdef REDIRECT_MALLOC
-
-/* Avoid unnecessary nested procedure calls here, by #defining some	*/
-/* malloc replacements.  Otherwise we end up saving a 			*/
-/* meaningless return address in the object.  It also speeds things up,	*/
-/* but it is admittedly quite ugly.					*/
-# ifdef GC_ADD_CALLER
-#   define RA GC_RETURN_ADDR,
-# else
-#   define RA
-# endif
-# define GC_debug_malloc_replacement(lb) \
-	GC_debug_malloc(lb, RA "unknown", 0)
-
-# ifdef __STDC__
-    GC_PTR malloc(size_t lb)
-# else
-    GC_PTR malloc(lb)
-    size_t lb;
-# endif
-  {
-    /* It might help to manually inline the GC_malloc call here.	*/
-    /* But any decent compiler should reduce the extra procedure call	*/
-    /* to at most a jump instruction in this case.			*/
-#   if defined(I386) && defined(GC_SOLARIS_THREADS)
-      /*
-       * Thread initialisation can call malloc before
-       * we're ready for it.
-       * It's not clear that this is enough to help matters.
-       * The thread implementation may well call malloc at other
-       * inopportune times.
-       */
-      if (!GC_is_initialized) return sbrk(lb);
-#   endif /* I386 && GC_SOLARIS_THREADS */
-    return((GC_PTR)REDIRECT_MALLOC(lb));
-  }
-
-# ifdef __STDC__
-    GC_PTR calloc(size_t n, size_t lb)
-# else
-    GC_PTR calloc(n, lb)
-    size_t n, lb;
-# endif
-  {
-    return((GC_PTR)REDIRECT_MALLOC(n*lb));
-  }
-
-#ifndef strdup
-# include <string.h>
-# ifdef __STDC__
-    char *strdup(const char *s)
-# else
-    char *strdup(s)
-    char *s;
-# endif
-  {
-    size_t len = strlen(s) + 1;
-    char * result = ((char *)REDIRECT_MALLOC(len+1));
-    BCOPY(s, result, len+1);
-    return result;
-  }
-#endif /* !defined(strdup) */
- /* If strdup is macro defined, we assume that it actually calls malloc, */
- /* and thus the right thing will happen even without overriding it.	 */
- /* This seems to be true on most Linux systems.			 */
-
-#undef GC_debug_malloc_replacement
-
-# endif /* REDIRECT_MALLOC */
-
-/* Explicitly deallocate an object p.				*/
-# ifdef __STDC__
-    void GC_free(GC_PTR p)
-# else
-    void GC_free(p)
-    GC_PTR p;
-# endif
-{
-    register struct hblk *h;
-    register hdr *hhdr;
-    register signed_word sz;
-    register ptr_t * flh;
-    register int knd;
-    register struct obj_kind * ok;
-    DCL_LOCK_STATE;
-
-    if (p == 0) return;
-    	/* Required by ANSI.  It's not my fault ...	*/
-    h = HBLKPTR(p);
-    hhdr = HDR(h);
-    GC_ASSERT(GC_base(p) == p);
-#   if defined(REDIRECT_MALLOC) && \
-	(defined(GC_SOLARIS_THREADS) || defined(GC_LINUX_THREADS) \
-	 || defined(__MINGW32__)) /* Should this be MSWIN32 in general? */
-	/* For Solaris, we have to redirect malloc calls during		*/
-	/* initialization.  For the others, this seems to happen 	*/
- 	/* implicitly.							*/
-	/* Don't try to deallocate that memory.				*/
-	if (0 == hhdr) return;
-#   endif
-    knd = hhdr -> hb_obj_kind;
-    sz = hhdr -> hb_sz;
-    ok = &GC_obj_kinds[knd];
-    if (EXPECT((sz <= MAXOBJSZ), 1)) {
-#	ifdef THREADS
-	    DISABLE_SIGNALS();
-	    LOCK();
-#	endif
-	GC_mem_freed += sz;
-	/* A signal here can make GC_mem_freed and GC_non_gc_bytes	*/
-	/* inconsistent.  We claim this is benign.			*/
-	if (IS_UNCOLLECTABLE(knd)) GC_non_gc_bytes -= WORDS_TO_BYTES(sz);
-		/* Its unnecessary to clear the mark bit.  If the 	*/
-		/* object is reallocated, it doesn't matter.  O.w. the	*/
-		/* collector will do it, since it's on a free list.	*/
-	if (ok -> ok_init) {
-	    BZERO((word *)p + 1, WORDS_TO_BYTES(sz-1));
-	}
-	flh = &(ok -> ok_freelist[sz]);
-	obj_link(p) = *flh;
-	*flh = (ptr_t)p;
-#	ifdef THREADS
-	    UNLOCK();
-	    ENABLE_SIGNALS();
-#	endif
-    } else {
-    	DISABLE_SIGNALS();
-        LOCK();
-        GC_mem_freed += sz;
-	if (IS_UNCOLLECTABLE(knd)) GC_non_gc_bytes -= WORDS_TO_BYTES(sz);
-        GC_freehblk(h);
-        UNLOCK();
-        ENABLE_SIGNALS();
-    }
-}
-
-/* Explicitly deallocate an object p when we already hold lock.		*/
-/* Only used for internally allocated objects, so we can take some 	*/
-/* shortcuts.								*/
-#ifdef THREADS
-void GC_free_inner(GC_PTR p)
-{
-    register struct hblk *h;
-    register hdr *hhdr;
-    register signed_word sz;
-    register ptr_t * flh;
-    register int knd;
-    register struct obj_kind * ok;
-    DCL_LOCK_STATE;
-
-    h = HBLKPTR(p);
-    hhdr = HDR(h);
-    knd = hhdr -> hb_obj_kind;
-    sz = hhdr -> hb_sz;
-    ok = &GC_obj_kinds[knd];
-    if (sz <= MAXOBJSZ) {
-	GC_mem_freed += sz;
-	if (IS_UNCOLLECTABLE(knd)) GC_non_gc_bytes -= WORDS_TO_BYTES(sz);
-	if (ok -> ok_init) {
-	    BZERO((word *)p + 1, WORDS_TO_BYTES(sz-1));
-	}
-	flh = &(ok -> ok_freelist[sz]);
-	obj_link(p) = *flh;
-	*flh = (ptr_t)p;
-    } else {
-        GC_mem_freed += sz;
-	if (IS_UNCOLLECTABLE(knd)) GC_non_gc_bytes -= WORDS_TO_BYTES(sz);
-        GC_freehblk(h);
-    }
-}
-#endif /* THREADS */
-
-# if defined(REDIRECT_MALLOC) && !defined(REDIRECT_FREE)
-#   define REDIRECT_FREE GC_free
-# endif
-# ifdef REDIRECT_FREE
-#   ifdef __STDC__
-      void free(GC_PTR p)
-#   else
-      void free(p)
-      GC_PTR p;
-#   endif
-  {
-#   ifndef IGNORE_FREE
-      REDIRECT_FREE(p);
-#   endif
-  }
-# endif  /* REDIRECT_MALLOC */
diff --git a/boehm-gc/mallocx.c b/boehm-gc/mallocx.c
deleted file mode 100644
index 5ad593dabb9..00000000000
--- a/boehm-gc/mallocx.c
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * These are extra allocation routines which are likely to be less
- * frequently used than those in malloc.c.  They are separate in the
- * hope that the .o file will be excluded from statically linked
- * executables.  We should probably break this up further.
- */
-
-#include <stdio.h>
-#include "private/gc_priv.h"
-
-extern ptr_t GC_clear_stack();  /* in misc.c, behaves like identity */
-void GC_extend_size_map();      /* in misc.c. */
-GC_bool GC_alloc_reclaim_list();	/* in malloc.c */
-
-/* Some externally visible but unadvertised variables to allow access to */
-/* free lists from inlined allocators without including gc_priv.h	 */
-/* or introducing dependencies on internal data structure layouts.	 */
-ptr_t * GC_CONST GC_objfreelist_ptr = GC_objfreelist;
-ptr_t * GC_CONST GC_aobjfreelist_ptr = GC_aobjfreelist;
-ptr_t * GC_CONST GC_uobjfreelist_ptr = GC_uobjfreelist;
-# ifdef ATOMIC_UNCOLLECTABLE
-    ptr_t * GC_CONST GC_auobjfreelist_ptr = GC_auobjfreelist;
-# endif
-
-
-GC_PTR GC_generic_or_special_malloc(lb,knd)
-word lb;
-int knd;
-{
-    switch(knd) {
-#     ifdef STUBBORN_ALLOC
-	case STUBBORN:
-	    return(GC_malloc_stubborn((size_t)lb));
-#     endif
-	case PTRFREE:
-	    return(GC_malloc_atomic((size_t)lb));
-	case NORMAL:
-	    return(GC_malloc((size_t)lb));
-	case UNCOLLECTABLE:
-	    return(GC_malloc_uncollectable((size_t)lb));
-#       ifdef ATOMIC_UNCOLLECTABLE
-	  case AUNCOLLECTABLE:
-	    return(GC_malloc_atomic_uncollectable((size_t)lb));
-#	endif /* ATOMIC_UNCOLLECTABLE */
-	default:
-	    return(GC_generic_malloc(lb,knd));
-    }
-}
-
-
-/* Change the size of the block pointed to by p to contain at least   */
-/* lb bytes.  The object may be (and quite likely will be) moved.     */
-/* The kind (e.g. atomic) is the same as that of the old.	      */
-/* Shrinking of large blocks is not implemented well.                 */
-# ifdef __STDC__
-    GC_PTR GC_realloc(GC_PTR p, size_t lb)
-# else
-    GC_PTR GC_realloc(p,lb)
-    GC_PTR p;
-    size_t lb;
-# endif
-{
-register struct hblk * h;
-register hdr * hhdr;
-register word sz;	 /* Current size in bytes	*/
-register word orig_sz;	 /* Original sz in bytes	*/
-int obj_kind;
-
-    if (p == 0) return(GC_malloc(lb));	/* Required by ANSI */
-    h = HBLKPTR(p);
-    hhdr = HDR(h);
-    sz = hhdr -> hb_sz;
-    obj_kind = hhdr -> hb_obj_kind;
-    sz = WORDS_TO_BYTES(sz);
-    orig_sz = sz;
-
-    if (sz > MAXOBJBYTES) {
-	/* Round it up to the next whole heap block */
-	  register word descr;
-	  
-	  sz = (sz+HBLKSIZE-1) & (~HBLKMASK);
-	  hhdr -> hb_sz = BYTES_TO_WORDS(sz);
-	  descr = GC_obj_kinds[obj_kind].ok_descriptor;
-          if (GC_obj_kinds[obj_kind].ok_relocate_descr) descr += sz;
-          hhdr -> hb_descr = descr;
-	  if (IS_UNCOLLECTABLE(obj_kind)) GC_non_gc_bytes += (sz - orig_sz);
-	  /* Extra area is already cleared by GC_alloc_large_and_clear. */
-    }
-    if (ADD_SLOP(lb) <= sz) {
-	if (lb >= (sz >> 1)) {
-#	    ifdef STUBBORN_ALLOC
-	        if (obj_kind == STUBBORN) GC_change_stubborn(p);
-#	    endif
-	    if (orig_sz > lb) {
-	      /* Clear unneeded part of object to avoid bogus pointer */
-	      /* tracing.					      */
-	      /* Safe for stubborn objects.			      */
-	        BZERO(((ptr_t)p) + lb, orig_sz - lb);
-	    }
-	    return(p);
-	} else {
-	    /* shrink */
-	      GC_PTR result =
-	      		GC_generic_or_special_malloc((word)lb, obj_kind);
-
-	      if (result == 0) return(0);
-	          /* Could also return original object.  But this 	*/
-	          /* gives the client warning of imminent disaster.	*/
-	      BCOPY(p, result, lb);
-#	      ifndef IGNORE_FREE
-	        GC_free(p);
-#	      endif
-	      return(result);
-	}
-    } else {
-	/* grow */
-	  GC_PTR result =
-	  	GC_generic_or_special_malloc((word)lb, obj_kind);
-
-	  if (result == 0) return(0);
-	  BCOPY(p, result, sz);
-#	  ifndef IGNORE_FREE
-	    GC_free(p);
-#	  endif
-	  return(result);
-    }
-}
-
-# if defined(REDIRECT_MALLOC) && !defined(REDIRECT_REALLOC)
-#   define REDIRECT_REALLOC GC_realloc
-# endif
-
-# ifdef REDIRECT_REALLOC
-
-/* As with malloc, avoid two levels of extra calls here.	*/
-# ifdef GC_ADD_CALLER
-#   define RA GC_RETURN_ADDR,
-# else
-#   define RA
-# endif
-# define GC_debug_realloc_replacement(p, lb) \
-	GC_debug_realloc(p, lb, RA "unknown", 0)
-
-# ifdef __STDC__
-    GC_PTR realloc(GC_PTR p, size_t lb)
-# else
-    GC_PTR realloc(p,lb)
-    GC_PTR p;
-    size_t lb;
-# endif
-  {
-    return(REDIRECT_REALLOC(p, lb));
-  }
-
-# undef GC_debug_realloc_replacement
-# endif /* REDIRECT_REALLOC */
-
-
-/* Allocate memory such that only pointers to near the 		*/
-/* beginning of the object are considered.			*/
-/* We avoid holding allocation lock while we clear memory.	*/
-ptr_t GC_generic_malloc_ignore_off_page(lb, k)
-register size_t lb;
-register int k;
-{
-    register ptr_t result;
-    word lw;
-    word n_blocks;
-    GC_bool init;
-    DCL_LOCK_STATE;
-    
-    if (SMALL_OBJ(lb))
-        return(GC_generic_malloc((word)lb, k));
-    lw = ROUNDED_UP_WORDS(lb);
-    n_blocks = OBJ_SZ_TO_BLOCKS(lw);
-    init = GC_obj_kinds[k].ok_init;
-    if (GC_have_errors) GC_print_all_errors();
-    GC_INVOKE_FINALIZERS();
-    DISABLE_SIGNALS();
-    LOCK();
-    result = (ptr_t)GC_alloc_large(lw, k, IGNORE_OFF_PAGE);
-    if (0 != result) {
-        if (GC_debugging_started) {
-	    BZERO(result, n_blocks * HBLKSIZE);
-        } else {
-#           ifdef THREADS
-	      /* Clear any memory that might be used for GC descriptors */
-	      /* before we release the lock.			      */
-	        ((word *)result)[0] = 0;
-	        ((word *)result)[1] = 0;
-	        ((word *)result)[lw-1] = 0;
-	        ((word *)result)[lw-2] = 0;
-#	    endif
-        }
-    }
-    GC_words_allocd += lw;
-    UNLOCK();
-    ENABLE_SIGNALS();
-    if (0 == result) {
-        return((*GC_oom_fn)(lb));
-    } else {
-    	if (init && !GC_debugging_started) {
-	    BZERO(result, n_blocks * HBLKSIZE);
-        }
-        return(result);
-    }
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-  void * GC_malloc_ignore_off_page(size_t lb)
-# else
-  char * GC_malloc_ignore_off_page(lb)
-  register size_t lb;
-# endif
-{
-    return((GC_PTR)GC_generic_malloc_ignore_off_page(lb, NORMAL));
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-  void * GC_malloc_atomic_ignore_off_page(size_t lb)
-# else
-  char * GC_malloc_atomic_ignore_off_page(lb)
-  register size_t lb;
-# endif
-{
-    return((GC_PTR)GC_generic_malloc_ignore_off_page(lb, PTRFREE));
-}
-
-/* Increment GC_words_allocd from code that doesn't have direct access 	*/
-/* to GC_arrays.							*/
-# ifdef __STDC__
-void GC_incr_words_allocd(size_t n)
-{
-    GC_words_allocd += n;
-}
-
-/* The same for GC_mem_freed.				*/
-void GC_incr_mem_freed(size_t n)
-{
-    GC_mem_freed += n;
-}
-# endif /* __STDC__ */
-
-/* Analogous to the above, but assumes a small object size, and 	*/
-/* bypasses MERGE_SIZES mechanism.  Used by gc_inline.h.		*/
-ptr_t GC_generic_malloc_words_small_inner(lw, k)
-register word lw;
-register int k;
-{
-register ptr_t op;
-register ptr_t *opp;
-register struct obj_kind * kind = GC_obj_kinds + k;
-
-    opp = &(kind -> ok_freelist[lw]);
-    if( (op = *opp) == 0 ) {
-        if (!GC_is_initialized) {
-            GC_init_inner();
-        }
-	if (kind -> ok_reclaim_list != 0 || GC_alloc_reclaim_list(kind)) {
-	    op = GC_clear_stack(GC_allocobj((word)lw, k));
-	}
-	if (op == 0) {
-	    UNLOCK();
-	    ENABLE_SIGNALS();
-	    return ((*GC_oom_fn)(WORDS_TO_BYTES(lw)));
-	}
-    }
-    *opp = obj_link(op);
-    obj_link(op) = 0;
-    GC_words_allocd += lw;
-    return((ptr_t)op);
-}
-
-/* Analogous to the above, but assumes a small object size, and 	*/
-/* bypasses MERGE_SIZES mechanism.  Used by gc_inline.h.		*/
-#ifdef __STDC__
-     ptr_t GC_generic_malloc_words_small(size_t lw, int k)
-#else 
-     ptr_t GC_generic_malloc_words_small(lw, k)
-     register word lw;
-     register int k;
-#endif
-{
-register ptr_t op;
-DCL_LOCK_STATE;
-
-    if (GC_have_errors) GC_print_all_errors();
-    GC_INVOKE_FINALIZERS();
-    DISABLE_SIGNALS();
-    LOCK();
-    op = GC_generic_malloc_words_small_inner(lw, k);
-    UNLOCK();
-    ENABLE_SIGNALS();
-    return((ptr_t)op);
-}
-
-#if defined(THREADS) && !defined(SRC_M3)
-
-extern signed_word GC_mem_found;   /* Protected by GC lock.  */
-
-#ifdef PARALLEL_MARK
-volatile signed_word GC_words_allocd_tmp = 0;
-                        /* Number of words of memory allocated since    */
-                        /* we released the GC lock.  Instead of         */
-                        /* reacquiring the GC lock just to add this in, */
-                        /* we add it in the next time we reacquire      */
-                        /* the lock.  (Atomically adding it doesn't     */
-                        /* work, since we would have to atomically      */
-                        /* update it in GC_malloc, which is too         */
-                        /* expensive.                                   */
-#endif /* PARALLEL_MARK */
-
-/* See reclaim.c: */
-extern ptr_t GC_reclaim_generic();
-
-/* Return a list of 1 or more objects of the indicated size, linked	*/
-/* through the first word in the object.  This has the advantage that	*/
-/* it acquires the allocation lock only once, and may greatly reduce	*/
-/* time wasted contending for the allocation lock.  Typical usage would */
-/* be in a thread that requires many items of the same size.  It would	*/
-/* keep its own free list in thread-local storage, and call		*/
-/* GC_malloc_many or friends to replenish it.  (We do not round up	*/
-/* object sizes, since a call indicates the intention to consume many	*/
-/* objects of exactly this size.)					*/
-/* We return the free-list by assigning it to *result, since it is	*/
-/* not safe to return, e.g. a linked list of pointer-free objects,	*/
-/* since the collector would not retain the entire list if it were 	*/
-/* invoked just as we were returning.					*/
-/* Note that the client should usually clear the link field.		*/
-void GC_generic_malloc_many(lb, k, result)
-register word lb;
-register int k;
-ptr_t *result;
-{
-ptr_t op;
-ptr_t p;
-ptr_t *opp;
-word lw;
-word my_words_allocd = 0;
-struct obj_kind * ok = &(GC_obj_kinds[k]);
-DCL_LOCK_STATE;
-
-#   if defined(GATHERSTATS) || defined(PARALLEL_MARK)
-#     define COUNT_ARG , &my_words_allocd
-#   else
-#     define COUNT_ARG
-#     define NEED_TO_COUNT
-#   endif
-    if (!SMALL_OBJ(lb)) {
-        op = GC_generic_malloc(lb, k);
-        if(0 != op) obj_link(op) = 0;
-	*result = op;
-        return;
-    }
-    lw = ALIGNED_WORDS(lb);
-    if (GC_have_errors) GC_print_all_errors();
-    GC_INVOKE_FINALIZERS();
-    DISABLE_SIGNALS();
-    LOCK();
-    if (!GC_is_initialized) GC_init_inner();
-    /* Do our share of marking work */
-      if (GC_incremental && !GC_dont_gc) {
-        ENTER_GC();
-	GC_collect_a_little_inner(1);
-        EXIT_GC();
-      }
-    /* First see if we can reclaim a page of objects waiting to be */
-    /* reclaimed.						   */
-    {
-	struct hblk ** rlh = ok -> ok_reclaim_list;
-	struct hblk * hbp;
-	hdr * hhdr;
-
-	rlh += lw;
-    	while ((hbp = *rlh) != 0) {
-            hhdr = HDR(hbp);
-            *rlh = hhdr -> hb_next;
-	    hhdr -> hb_last_reclaimed = (unsigned short) GC_gc_no;
-#	    ifdef PARALLEL_MARK
-		{
-		  signed_word my_words_allocd_tmp = GC_words_allocd_tmp;
-
-		  GC_ASSERT(my_words_allocd_tmp >= 0);
-		  /* We only decrement it while holding the GC lock.	*/
-		  /* Thus we can't accidentally adjust it down in more	*/
-		  /* than one thread simultaneously.			*/
-		  if (my_words_allocd_tmp != 0) {
-		    (void)GC_atomic_add(
-				(volatile GC_word *)(&GC_words_allocd_tmp),
-				(GC_word)(-my_words_allocd_tmp));
-		    GC_words_allocd += my_words_allocd_tmp;
-		  }
-		}
-		GC_acquire_mark_lock();
-		++ GC_fl_builder_count;
-		UNLOCK();
-		ENABLE_SIGNALS();
-		GC_release_mark_lock();
-#	    endif
-	    op = GC_reclaim_generic(hbp, hhdr, lw,
-				    ok -> ok_init, 0 COUNT_ARG);
-            if (op != 0) {
-#	      ifdef NEED_TO_COUNT
-		/* We are neither gathering statistics, nor marking in	*/
-		/* parallel.  Thus GC_reclaim_generic doesn't count	*/
-		/* for us.						*/
-    		for (p = op; p != 0; p = obj_link(p)) {
-        	  my_words_allocd += lw;
-		}
-#	      endif
-#	      if defined(GATHERSTATS)
-	        /* We also reclaimed memory, so we need to adjust 	*/
-	        /* that count.						*/
-		/* This should be atomic, so the results may be		*/
-		/* inaccurate.						*/
-		GC_mem_found += my_words_allocd;
-#	      endif
-#	      ifdef PARALLEL_MARK
-		*result = op;
-		(void)GC_atomic_add(
-				(volatile GC_word *)(&GC_words_allocd_tmp),
-				(GC_word)(my_words_allocd));
-		GC_acquire_mark_lock();
-		-- GC_fl_builder_count;
-		if (GC_fl_builder_count == 0) GC_notify_all_builder();
-		GC_release_mark_lock();
-		(void) GC_clear_stack(0);
-		return;
-#	      else
-	        GC_words_allocd += my_words_allocd;
-	        goto out;
-#	      endif
-	    }
-#	    ifdef PARALLEL_MARK
-	      GC_acquire_mark_lock();
-	      -- GC_fl_builder_count;
-	      if (GC_fl_builder_count == 0) GC_notify_all_builder();
-	      GC_release_mark_lock();
-	      DISABLE_SIGNALS();
-	      LOCK();
-	      /* GC lock is needed for reclaim list access.	We	*/
-	      /* must decrement fl_builder_count before reaquiring GC	*/
-	      /* lock.  Hopefully this path is rare.			*/
-#	    endif
-    	}
-    }
-    /* Next try to use prefix of global free list if there is one.	*/
-    /* We don't refill it, but we need to use it up before allocating	*/
-    /* a new block ourselves.						*/
-      opp = &(GC_obj_kinds[k].ok_freelist[lw]);
-      if ( (op = *opp) != 0 ) {
-	*opp = 0;
-        my_words_allocd = 0;
-        for (p = op; p != 0; p = obj_link(p)) {
-          my_words_allocd += lw;
-          if (my_words_allocd >= BODY_SZ) {
-            *opp = obj_link(p);
-            obj_link(p) = 0;
-            break;
-	  }
-        }
-	GC_words_allocd += my_words_allocd;
-	goto out;
-      }
-    /* Next try to allocate a new block worth of objects of this size.	*/
-    {
-	struct hblk *h = GC_allochblk(lw, k, 0);
-	if (h != 0) {
-	  if (IS_UNCOLLECTABLE(k)) GC_set_hdr_marks(HDR(h));
-	  GC_words_allocd += BYTES_TO_WORDS(HBLKSIZE)
-			       - BYTES_TO_WORDS(HBLKSIZE) % lw;
-#	  ifdef PARALLEL_MARK
-	    GC_acquire_mark_lock();
-	    ++ GC_fl_builder_count;
-	    UNLOCK();
-	    ENABLE_SIGNALS();
-	    GC_release_mark_lock();
-#	  endif
-
-	  op = GC_build_fl(h, lw, ok -> ok_init, 0);
-#	  ifdef PARALLEL_MARK
-	    *result = op;
-	    GC_acquire_mark_lock();
-	    -- GC_fl_builder_count;
-	    if (GC_fl_builder_count == 0) GC_notify_all_builder();
-	    GC_release_mark_lock();
-	    (void) GC_clear_stack(0);
-	    return;
-#	  else
-	    goto out;
-#	  endif
-	}
-    }
-    
-    /* As a last attempt, try allocating a single object.  Note that	*/
-    /* this may trigger a collection or expand the heap.		*/
-      op = GC_generic_malloc_inner(lb, k);
-      if (0 != op) obj_link(op) = 0;
-    
-  out:
-    *result = op;
-    UNLOCK();
-    ENABLE_SIGNALS();
-    (void) GC_clear_stack(0);
-}
-
-GC_PTR GC_malloc_many(size_t lb)
-{
-    ptr_t result;
-    GC_generic_malloc_many(lb, NORMAL, &result);
-    return result;
-}
-
-/* Note that the "atomic" version of this would be unsafe, since the	*/
-/* links would not be seen by the collector.				*/
-# endif
-
-/* Allocate lb bytes of pointerful, traced, but not collectable data */
-# ifdef __STDC__
-    GC_PTR GC_malloc_uncollectable(size_t lb)
-# else
-    GC_PTR GC_malloc_uncollectable(lb)
-    size_t lb;
-# endif
-{
-register ptr_t op;
-register ptr_t *opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  if (EXTRA_BYTES != 0 && lb != 0) lb--;
-	    	  /* We don't need the extra byte, since this won't be	*/
-	    	  /* collected anyway.					*/
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_uobjfreelist[lw]);
-	FASTLOCK();
-        if( FASTLOCK_SUCCEEDED() && (op = *opp) != 0 ) {
-            /* See above comment on signals.	*/
-            *opp = obj_link(op);
-            obj_link(op) = 0;
-            GC_words_allocd += lw;
-            /* Mark bit ws already set on free list.  It will be	*/
-	    /* cleared only temporarily during a collection, as a 	*/
-	    /* result of the normal free list mark bit clearing.	*/
-            GC_non_gc_bytes += WORDS_TO_BYTES(lw);
-            FASTUNLOCK();
-            return((GC_PTR) op);
-        }
-        FASTUNLOCK();
-        op = (ptr_t)GC_generic_malloc((word)lb, UNCOLLECTABLE);
-    } else {
-	op = (ptr_t)GC_generic_malloc((word)lb, UNCOLLECTABLE);
-    }
-    if (0 == op) return(0);
-    /* We don't need the lock here, since we have an undisguised 	*/
-    /* pointer.  We do need to hold the lock while we adjust		*/
-    /* mark bits.							*/
-    {
-	register struct hblk * h;
-	
-	h = HBLKPTR(op);
-	lw = HDR(h) -> hb_sz;
-	
-	DISABLE_SIGNALS();
-	LOCK();
-	GC_set_mark_bit(op);
-	GC_non_gc_bytes += WORDS_TO_BYTES(lw);
-	UNLOCK();
-	ENABLE_SIGNALS();
-	return((GC_PTR) op);
-    }
-}
-
-#ifdef __STDC__
-/* Not well tested nor integrated.	*/
-/* Debug version is tricky and currently missing.	*/
-#include <limits.h>
-
-GC_PTR GC_memalign(size_t align, size_t lb) 
-{ 
-    size_t new_lb;
-    size_t offset;
-    ptr_t result;
-
-#   ifdef ALIGN_DOUBLE
-	if (align <= WORDS_TO_BYTES(2) && lb > align) return GC_malloc(lb);
-#   endif
-    if (align <= WORDS_TO_BYTES(1)) return GC_malloc(lb);
-    if (align >= HBLKSIZE/2 || lb >= HBLKSIZE/2) {
-        if (align > HBLKSIZE) return GC_oom_fn(LONG_MAX-1024) /* Fail */;
-	return GC_malloc(lb <= HBLKSIZE? HBLKSIZE : lb);
-	    /* Will be HBLKSIZE aligned.	*/
-    }
-    /* We could also try to make sure that the real rounded-up object size */
-    /* is a multiple of align.  That would be correct up to HBLKSIZE.	   */
-    new_lb = lb + align - 1;
-    result = GC_malloc(new_lb);
-    offset = (word)result % align;
-    if (offset != 0) {
-	offset = align - offset;
-        if (!GC_all_interior_pointers) {
-	    if (offset >= VALID_OFFSET_SZ) return GC_malloc(HBLKSIZE);
-	    GC_register_displacement(offset);
-	}
-    }
-    result = (GC_PTR) ((ptr_t)result + offset);
-    GC_ASSERT((word)result % align == 0);
-    return result;
-}
-#endif 
-
-# ifdef ATOMIC_UNCOLLECTABLE
-/* Allocate lb bytes of pointerfree, untraced, uncollectable data 	*/
-/* This is normally roughly equivalent to the system malloc.		*/
-/* But it may be useful if malloc is redefined.				*/
-# ifdef __STDC__
-    GC_PTR GC_malloc_atomic_uncollectable(size_t lb)
-# else
-    GC_PTR GC_malloc_atomic_uncollectable(lb)
-    size_t lb;
-# endif
-{
-register ptr_t op;
-register ptr_t *opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  if (EXTRA_BYTES != 0 && lb != 0) lb--;
-	    	  /* We don't need the extra byte, since this won't be	*/
-	    	  /* collected anyway.					*/
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_auobjfreelist[lw]);
-	FASTLOCK();
-        if( FASTLOCK_SUCCEEDED() && (op = *opp) != 0 ) {
-            /* See above comment on signals.	*/
-            *opp = obj_link(op);
-            obj_link(op) = 0;
-            GC_words_allocd += lw;
-	    /* Mark bit was already set while object was on free list. */
-            GC_non_gc_bytes += WORDS_TO_BYTES(lw);
-            FASTUNLOCK();
-            return((GC_PTR) op);
-        }
-        FASTUNLOCK();
-        op = (ptr_t)GC_generic_malloc((word)lb, AUNCOLLECTABLE);
-    } else {
-	op = (ptr_t)GC_generic_malloc((word)lb, AUNCOLLECTABLE);
-    }
-    if (0 == op) return(0);
-    /* We don't need the lock here, since we have an undisguised 	*/
-    /* pointer.  We do need to hold the lock while we adjust		*/
-    /* mark bits.							*/
-    {
-	register struct hblk * h;
-	
-	h = HBLKPTR(op);
-	lw = HDR(h) -> hb_sz;
-	
-	DISABLE_SIGNALS();
-	LOCK();
-	GC_set_mark_bit(op);
-	GC_non_gc_bytes += WORDS_TO_BYTES(lw);
-	UNLOCK();
-	ENABLE_SIGNALS();
-	return((GC_PTR) op);
-    }
-}
-
-#endif /* ATOMIC_UNCOLLECTABLE */
diff --git a/boehm-gc/mark.c b/boehm-gc/mark.c
deleted file mode 100644
index 09dfe92af31..00000000000
--- a/boehm-gc/mark.c
+++ /dev/null
@@ -1,1817 +0,0 @@
-
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-
-# include <stdio.h>
-# include "private/gc_pmark.h"
-
-#if defined(MSWIN32) && defined(__GNUC__)
-# include <excpt.h>
-#endif
-
-/* We put this here to minimize the risk of inlining. */
-/*VARARGS*/
-#ifdef __WATCOMC__
-  void GC_noop(void *p, ...) {}
-#else
-  void GC_noop() {}
-#endif
-
-/* Single argument version, robust against whole program analysis. */
-void GC_noop1(x)
-word x;
-{
-    static VOLATILE word sink;
-
-    sink = x;
-}
-
-/* mark_proc GC_mark_procs[MAX_MARK_PROCS] = {0} -- declared in gc_priv.h */
-
-word GC_n_mark_procs = GC_RESERVED_MARK_PROCS;
-
-/* Initialize GC_obj_kinds properly and standard free lists properly.  	*/
-/* This must be done statically since they may be accessed before 	*/
-/* GC_init is called.							*/
-/* It's done here, since we need to deal with mark descriptors.		*/
-struct obj_kind GC_obj_kinds[MAXOBJKINDS] = {
-/* PTRFREE */ { &GC_aobjfreelist[0], 0 /* filled in dynamically */,
-		0 | GC_DS_LENGTH, FALSE, FALSE },
-/* NORMAL  */ { &GC_objfreelist[0], 0,
-		0 | GC_DS_LENGTH,  /* Adjusted in GC_init_inner for EXTRA_BYTES */
-		TRUE /* add length to descr */, TRUE },
-/* UNCOLLECTABLE */
-	      { &GC_uobjfreelist[0], 0,
-		0 | GC_DS_LENGTH, TRUE /* add length to descr */, TRUE },
-# ifdef ATOMIC_UNCOLLECTABLE
-   /* AUNCOLLECTABLE */
-	      { &GC_auobjfreelist[0], 0,
-		0 | GC_DS_LENGTH, FALSE /* add length to descr */, FALSE },
-# endif
-# ifdef STUBBORN_ALLOC
-/*STUBBORN*/ { &GC_sobjfreelist[0], 0,
-		0 | GC_DS_LENGTH, TRUE /* add length to descr */, TRUE },
-# endif
-};
-
-# ifdef ATOMIC_UNCOLLECTABLE
-#   ifdef STUBBORN_ALLOC
-      int GC_n_kinds = 5;
-#   else
-      int GC_n_kinds = 4;
-#   endif
-# else
-#   ifdef STUBBORN_ALLOC
-      int GC_n_kinds = 4;
-#   else
-      int GC_n_kinds = 3;
-#   endif
-# endif
-
-
-# ifndef INITIAL_MARK_STACK_SIZE
-#   define INITIAL_MARK_STACK_SIZE (1*HBLKSIZE)
-		/* INITIAL_MARK_STACK_SIZE * sizeof(mse) should be a 	*/
-		/* multiple of HBLKSIZE.				*/
-		/* The incremental collector actually likes a larger	*/
-		/* size, since it want to push all marked dirty objs	*/
-		/* before marking anything new.  Currently we let it	*/
-		/* grow dynamically.					*/
-# endif
-
-/*
- * Limits of stack for GC_mark routine.
- * All ranges between GC_mark_stack(incl.) and GC_mark_stack_top(incl.) still
- * need to be marked from.
- */
-
-word GC_n_rescuing_pages;	/* Number of dirty pages we marked from */
-				/* excludes ptrfree pages, etc.		*/
-
-mse * GC_mark_stack;
-
-mse * GC_mark_stack_limit;
-
-word GC_mark_stack_size = 0;
- 
-#ifdef PARALLEL_MARK
-  mse * VOLATILE GC_mark_stack_top;
-#else
-  mse * GC_mark_stack_top;
-#endif
-
-static struct hblk * scan_ptr;
-
-mark_state_t GC_mark_state = MS_NONE;
-
-GC_bool GC_mark_stack_too_small = FALSE;
-
-GC_bool GC_objects_are_marked = FALSE;	/* Are there collectable marked	*/
-					/* objects in the heap?		*/
-
-/* Is a collection in progress?  Note that this can return true in the	*/
-/* nonincremental case, if a collection has been abandoned and the	*/
-/* mark state is now MS_INVALID.					*/
-GC_bool GC_collection_in_progress()
-{
-    return(GC_mark_state != MS_NONE);
-}
-
-/* clear all mark bits in the header */
-void GC_clear_hdr_marks(hhdr)
-register hdr * hhdr;
-{
-#   ifdef USE_MARK_BYTES
-      BZERO(hhdr -> hb_marks, MARK_BITS_SZ);
-#   else
-      BZERO(hhdr -> hb_marks, MARK_BITS_SZ*sizeof(word));
-#   endif
-}
-
-/* Set all mark bits in the header.  Used for uncollectable blocks. */
-void GC_set_hdr_marks(hhdr)
-register hdr * hhdr;
-{
-    register int i;
-
-    for (i = 0; i < MARK_BITS_SZ; ++i) {
-#     ifdef USE_MARK_BYTES
-    	hhdr -> hb_marks[i] = 1;
-#     else
-    	hhdr -> hb_marks[i] = ONES;
-#     endif
-    }
-}
-
-/*
- * Clear all mark bits associated with block h.
- */
-/*ARGSUSED*/
-# if defined(__STDC__) || defined(__cplusplus)
-    static void clear_marks_for_block(struct hblk *h, word dummy)
-# else
-    static void clear_marks_for_block(h, dummy)
-    struct hblk *h;
-    word dummy;
-# endif
-{
-    register hdr * hhdr = HDR(h);
-    
-    if (IS_UNCOLLECTABLE(hhdr -> hb_obj_kind)) return;
-        /* Mark bit for these is cleared only once the object is 	*/
-        /* explicitly deallocated.  This either frees the block, or	*/
-        /* the bit is cleared once the object is on the free list.	*/
-    GC_clear_hdr_marks(hhdr);
-}
-
-/* Slow but general routines for setting/clearing/asking about mark bits */
-void GC_set_mark_bit(p)
-ptr_t p;
-{
-    register struct hblk *h = HBLKPTR(p);
-    register hdr * hhdr = HDR(h);
-    register int word_no = (word *)p - (word *)h;
-    
-    set_mark_bit_from_hdr(hhdr, word_no);
-}
-
-void GC_clear_mark_bit(p)
-ptr_t p;
-{
-    register struct hblk *h = HBLKPTR(p);
-    register hdr * hhdr = HDR(h);
-    register int word_no = (word *)p - (word *)h;
-    
-    clear_mark_bit_from_hdr(hhdr, word_no);
-}
-
-GC_bool GC_is_marked(p)
-ptr_t p;
-{
-    register struct hblk *h = HBLKPTR(p);
-    register hdr * hhdr = HDR(h);
-    register int word_no = (word *)p - (word *)h;
-    
-    return(mark_bit_from_hdr(hhdr, word_no));
-}
-
-
-/*
- * Clear mark bits in all allocated heap blocks.  This invalidates
- * the marker invariant, and sets GC_mark_state to reflect this.
- * (This implicitly starts marking to reestablish the invariant.)
- */
-void GC_clear_marks()
-{
-    GC_apply_to_all_blocks(clear_marks_for_block, (word)0);
-    GC_objects_are_marked = FALSE;
-    GC_mark_state = MS_INVALID;
-    scan_ptr = 0;
-#   ifdef GATHERSTATS
-	/* Counters reflect currently marked objects: reset here */
-        GC_composite_in_use = 0;
-        GC_atomic_in_use = 0;
-#   endif
-
-}
-
-/* Initiate a garbage collection.  Initiates a full collection if the	*/
-/* mark	state is invalid.						*/
-/*ARGSUSED*/
-void GC_initiate_gc()
-{
-    if (GC_dirty_maintained) GC_read_dirty();
-#   ifdef STUBBORN_ALLOC
-    	GC_read_changed();
-#   endif
-#   ifdef CHECKSUMS
-	{
-	    extern void GC_check_dirty();
-	    
-	    if (GC_dirty_maintained) GC_check_dirty();
-	}
-#   endif
-    GC_n_rescuing_pages = 0;
-    if (GC_mark_state == MS_NONE) {
-        GC_mark_state = MS_PUSH_RESCUERS;
-    } else if (GC_mark_state != MS_INVALID) {
-    	ABORT("unexpected state");
-    } /* else this is really a full collection, and mark	*/
-      /* bits are invalid.					*/
-    scan_ptr = 0;
-}
-
-
-static void alloc_mark_stack();
-
-/* Perform a small amount of marking.			*/
-/* We try to touch roughly a page of memory.		*/
-/* Return TRUE if we just finished a mark phase.	*/
-/* Cold_gc_frame is an address inside a GC frame that	*/
-/* remains valid until all marking is complete.		*/
-/* A zero value indicates that it's OK to miss some	*/
-/* register values.					*/
-/* We hold the allocation lock.  In the case of 	*/
-/* incremental collection, the world may not be stopped.*/
-#ifdef MSWIN32
-  /* For win32, this is called after we establish a structured	*/
-  /* exception handler, in case Windows unmaps one of our root	*/
-  /* segments.  See below.  In either case, we acquire the 	*/
-  /* allocator lock long before we get here.			*/
-  GC_bool GC_mark_some_inner(cold_gc_frame)
-  ptr_t cold_gc_frame;
-#else
-  GC_bool GC_mark_some(cold_gc_frame)
-  ptr_t cold_gc_frame;
-#endif
-{
-    switch(GC_mark_state) {
-    	case MS_NONE:
-    	    return(FALSE);
-    	    
-    	case MS_PUSH_RESCUERS:
-    	    if (GC_mark_stack_top
-    	        >= GC_mark_stack_limit - INITIAL_MARK_STACK_SIZE/2) {
-		/* Go ahead and mark, even though that might cause us to */
-		/* see more marked dirty objects later on.  Avoid this	 */
-		/* in the future.					 */
-		GC_mark_stack_too_small = TRUE;
-    	        MARK_FROM_MARK_STACK();
-    	        return(FALSE);
-    	    } else {
-    	        scan_ptr = GC_push_next_marked_dirty(scan_ptr);
-    	        if (scan_ptr == 0) {
-#		    ifdef CONDPRINT
-		      if (GC_print_stats) {
-			GC_printf1("Marked from %lu dirty pages\n",
-				   (unsigned long)GC_n_rescuing_pages);
-		      }
-#		    endif
-    	    	    GC_push_roots(FALSE, cold_gc_frame);
-    	    	    GC_objects_are_marked = TRUE;
-    	    	    if (GC_mark_state != MS_INVALID) {
-    	    	        GC_mark_state = MS_ROOTS_PUSHED;
-    	    	    }
-    	    	}
-    	    }
-    	    return(FALSE);
-    	
-    	case MS_PUSH_UNCOLLECTABLE:
-    	    if (GC_mark_stack_top
-    	        >= GC_mark_stack + GC_mark_stack_size/4) {
-#		ifdef PARALLEL_MARK
-		  /* Avoid this, since we don't parallelize the marker	*/
-		  /* here.						*/
-		  if (GC_parallel) GC_mark_stack_too_small = TRUE;
-#		endif
-    	        MARK_FROM_MARK_STACK();
-    	        return(FALSE);
-    	    } else {
-    	        scan_ptr = GC_push_next_marked_uncollectable(scan_ptr);
-    	        if (scan_ptr == 0) {
-    	    	    GC_push_roots(TRUE, cold_gc_frame);
-    	    	    GC_objects_are_marked = TRUE;
-    	    	    if (GC_mark_state != MS_INVALID) {
-    	    	        GC_mark_state = MS_ROOTS_PUSHED;
-    	    	    }
-    	    	}
-    	    }
-    	    return(FALSE);
-    	
-    	case MS_ROOTS_PUSHED:
-#	    ifdef PARALLEL_MARK
-	      /* In the incremental GC case, this currently doesn't	*/
-	      /* quite do the right thing, since it runs to		*/
-	      /* completion.  On the other hand, starting a		*/
-	      /* parallel marker is expensive, so perhaps it is		*/
-	      /* the right thing?					*/
-	      /* Eventually, incremental marking should run		*/
-	      /* asynchronously in multiple threads, without grabbing	*/
-	      /* the allocation lock.					*/
-	        if (GC_parallel) {
-		  GC_do_parallel_mark();
-		  GC_ASSERT(GC_mark_stack_top < GC_first_nonempty);
-		  GC_mark_stack_top = GC_mark_stack - 1;
-    	          if (GC_mark_stack_too_small) {
-    	            alloc_mark_stack(2*GC_mark_stack_size);
-    	          }
-		  if (GC_mark_state == MS_ROOTS_PUSHED) {
-    	            GC_mark_state = MS_NONE;
-    	            return(TRUE);
-		  } else {
-		    return(FALSE);
-	          }
-		}
-#	    endif
-    	    if (GC_mark_stack_top >= GC_mark_stack) {
-    	        MARK_FROM_MARK_STACK();
-    	        return(FALSE);
-    	    } else {
-    	        GC_mark_state = MS_NONE;
-    	        if (GC_mark_stack_too_small) {
-    	            alloc_mark_stack(2*GC_mark_stack_size);
-    	        }
-    	        return(TRUE);
-    	    }
-    	    
-    	case MS_INVALID:
-    	case MS_PARTIALLY_INVALID:
-	    if (!GC_objects_are_marked) {
-		GC_mark_state = MS_PUSH_UNCOLLECTABLE;
-		return(FALSE);
-	    }
-    	    if (GC_mark_stack_top >= GC_mark_stack) {
-    	        MARK_FROM_MARK_STACK();
-    	        return(FALSE);
-    	    }
-    	    if (scan_ptr == 0 && GC_mark_state == MS_INVALID) {
-		/* About to start a heap scan for marked objects. */
-		/* Mark stack is empty.  OK to reallocate.	  */
-		if (GC_mark_stack_too_small) {
-    	            alloc_mark_stack(2*GC_mark_stack_size);
-		}
-		GC_mark_state = MS_PARTIALLY_INVALID;
-    	    }
-    	    scan_ptr = GC_push_next_marked(scan_ptr);
-    	    if (scan_ptr == 0 && GC_mark_state == MS_PARTIALLY_INVALID) {
-    	    	GC_push_roots(TRUE, cold_gc_frame);
-    	    	GC_objects_are_marked = TRUE;
-    	    	if (GC_mark_state != MS_INVALID) {
-    	    	    GC_mark_state = MS_ROOTS_PUSHED;
-    	    	}
-    	    }
-    	    return(FALSE);
-    	default:
-    	    ABORT("GC_mark_some: bad state");
-    	    return(FALSE);
-    }
-}
-
-
-#ifdef MSWIN32
-
-# ifdef __GNUC__
-
-    typedef struct {
-      EXCEPTION_REGISTRATION ex_reg;
-      void *alt_path;
-    } ext_ex_regn;
-
-
-    static EXCEPTION_DISPOSITION mark_ex_handler(
-        struct _EXCEPTION_RECORD *ex_rec, 
-        void *est_frame,
-        struct _CONTEXT *context,
-        void *disp_ctxt)
-    {
-        if (ex_rec->ExceptionCode == STATUS_ACCESS_VIOLATION) {
-          ext_ex_regn *xer = (ext_ex_regn *)est_frame;
-
-          /* Unwind from the inner function assuming the standard */
-          /* function prologue.                                   */
-          /* Assumes code has not been compiled with              */
-          /* -fomit-frame-pointer.                                */
-          context->Esp = context->Ebp;
-          context->Ebp = *((DWORD *)context->Esp);
-          context->Esp = context->Esp - 8;
-
-          /* Resume execution at the "real" handler within the    */
-          /* wrapper function.                                    */
-          context->Eip = (DWORD )(xer->alt_path);
-
-          return ExceptionContinueExecution;
-
-        } else {
-            return ExceptionContinueSearch;
-        }
-    }
-# endif /* __GNUC__ */
-
-
-  GC_bool GC_mark_some(cold_gc_frame)
-  ptr_t cold_gc_frame;
-  {
-      GC_bool ret_val;
-
-#   ifndef __GNUC__
-      /* Windows 98 appears to asynchronously create and remove  */
-      /* writable memory mappings, for reasons we haven't yet    */
-      /* understood.  Since we look for writable regions to      */
-      /* determine the root set, we may try to mark from an      */
-      /* address range that disappeared since we started the     */
-      /* collection.  Thus we have to recover from faults here.  */
-      /* This code does not appear to be necessary for Windows   */
-      /* 95/NT/2000. Note that this code should never generate   */
-      /* an incremental GC write fault.                          */
-
-      __try {
-
-#   else /* __GNUC__ */
-
-      /* Manually install an exception handler since GCC does    */
-      /* not yet support Structured Exception Handling (SEH) on  */
-      /* Win32.                                                  */
-
-      ext_ex_regn er;
-
-      er.alt_path = &&handle_ex;
-      er.ex_reg.handler = mark_ex_handler;
-      asm volatile ("movl %%fs:0, %0" : "=r" (er.ex_reg.prev));
-      asm volatile ("movl %0, %%fs:0" : : "r" (&er));
-
-#   endif /* __GNUC__ */
-
-          ret_val = GC_mark_some_inner(cold_gc_frame);
-
-#   ifndef __GNUC__
-
-      } __except (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ?
-                EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
-
-#   else /* __GNUC__ */
-
-          /* Prevent GCC from considering the following code unreachable */
-          /* and thus eliminating it.                                    */
-          if (er.alt_path != 0)
-              goto rm_handler;
-
-handle_ex:
-          /* Execution resumes from here on an access violation. */
-
-#   endif /* __GNUC__ */
-
-#         ifdef CONDPRINT
-            if (GC_print_stats) {
-	      GC_printf0("Caught ACCESS_VIOLATION in marker. "
-		         "Memory mapping disappeared.\n");
-            }
-#         endif /* CONDPRINT */
-
-          /* We have bad roots on the stack.  Discard mark stack.  */
-          /* Rescan from marked objects.  Redetermine roots.	 */
-          GC_invalidate_mark_state();	
-          scan_ptr = 0;
-
-          ret_val = FALSE;
-
-#   ifndef __GNUC__
-
-      }
-
-#   else /* __GNUC__ */
-
-rm_handler:
-      /* Uninstall the exception handler */
-      asm volatile ("mov %0, %%fs:0" : : "r" (er.ex_reg.prev));
-
-#   endif /* __GNUC__ */
-
-      return ret_val;
-  }
-#endif /* MSWIN32 */
-
-
-GC_bool GC_mark_stack_empty()
-{
-    return(GC_mark_stack_top < GC_mark_stack);
-}	
-
-#ifdef PROF_MARKER
-    word GC_prof_array[10];
-#   define PROF(n) GC_prof_array[n]++
-#else
-#   define PROF(n)
-#endif
-
-/* Given a pointer to someplace other than a small object page or the	*/
-/* first page of a large object, either:				*/
-/*	- return a pointer to somewhere in the first page of the large	*/
-/*	  object, if current points to a large object.			*/
-/*	  In this case *hhdr is replaced with a pointer to the header	*/
-/*	  for the large object.						*/
-/*	- just return current if it does not point to a large object.	*/
-/*ARGSUSED*/
-ptr_t GC_find_start(current, hhdr, new_hdr_p)
-register ptr_t current;
-register hdr *hhdr, **new_hdr_p;
-{
-    if (GC_all_interior_pointers) {
-	if (hhdr != 0) {
-	    register ptr_t orig = current;
-	    
-	    current = (ptr_t)HBLKPTR(current);
-	    do {
-	      current = current - HBLKSIZE*(word)hhdr;
-	      hhdr = HDR(current);
-	    } while(IS_FORWARDING_ADDR_OR_NIL(hhdr));
-	    /* current points to near the start of the large object */
-	    if (hhdr -> hb_flags & IGNORE_OFF_PAGE) return(orig);
-	    if ((word *)orig - (word *)current
-	         >= (ptrdiff_t)(hhdr->hb_sz)) {
-	        /* Pointer past the end of the block */
-	        return(orig);
-	    }
-	    *new_hdr_p = hhdr;
-	    return(current);
-	} else {
-	    return(current);
-        }
-    } else {
-        return(current);
-    }
-}
-
-void GC_invalidate_mark_state()
-{
-    GC_mark_state = MS_INVALID;
-    GC_mark_stack_top = GC_mark_stack-1;
-}
-
-mse * GC_signal_mark_stack_overflow(msp)
-mse * msp;
-{
-    GC_mark_state = MS_INVALID;
-    GC_mark_stack_too_small = TRUE;
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-	GC_printf1("Mark stack overflow; current size = %lu entries\n",
-	    	    GC_mark_stack_size);
-      }
-#   endif
-    return(msp - GC_MARK_STACK_DISCARDS);
-}
-
-/*
- * Mark objects pointed to by the regions described by
- * mark stack entries between GC_mark_stack and GC_mark_stack_top,
- * inclusive.  Assumes the upper limit of a mark stack entry
- * is never 0.  A mark stack entry never has size 0.
- * We try to traverse on the order of a hblk of memory before we return.
- * Caller is responsible for calling this until the mark stack is empty.
- * Note that this is the most performance critical routine in the
- * collector.  Hence it contains all sorts of ugly hacks to speed
- * things up.  In particular, we avoid procedure calls on the common
- * path, we take advantage of peculiarities of the mark descriptor
- * encoding, we optionally maintain a cache for the block address to
- * header mapping, we prefetch when an object is "grayed", etc. 
- */
-mse * GC_mark_from(mark_stack_top, mark_stack, mark_stack_limit)
-mse * mark_stack_top;
-mse * mark_stack;
-mse * mark_stack_limit;
-{
-  int credit = HBLKSIZE;	/* Remaining credit for marking work	*/
-  register word * current_p;	/* Pointer to current candidate ptr.	*/
-  register word current;	/* Candidate pointer.			*/
-  register word * limit;	/* (Incl) limit of current candidate 	*/
-  				/* range				*/
-  register word descr;
-  register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-  register ptr_t least_ha = GC_least_plausible_heap_addr;
-  DECLARE_HDR_CACHE;
-
-# define SPLIT_RANGE_WORDS 128  /* Must be power of 2.		*/
-
-  GC_objects_are_marked = TRUE;
-  INIT_HDR_CACHE;
-# ifdef OS2 /* Use untweaked version to circumvent compiler problem */
-  while (mark_stack_top >= mark_stack && credit >= 0) {
-# else
-  while ((((ptr_t)mark_stack_top - (ptr_t)mark_stack) | credit)
-  	>= 0) {
-# endif
-    current_p = mark_stack_top -> mse_start;
-    descr = mark_stack_top -> mse_descr;
-  retry:
-    /* current_p and descr describe the current object.		*/
-    /* *mark_stack_top is vacant.				*/
-    /* The following is 0 only for small objects described by a simple	*/
-    /* length descriptor.  For many applications this is the common	*/
-    /* case, so we try to detect it quickly.				*/
-    if (descr & ((~(WORDS_TO_BYTES(SPLIT_RANGE_WORDS) - 1)) | GC_DS_TAGS)) {
-      word tag = descr & GC_DS_TAGS;
-      
-      switch(tag) {
-        case GC_DS_LENGTH:
-          /* Large length.					        */
-          /* Process part of the range to avoid pushing too much on the	*/
-          /* stack.							*/
-	  GC_ASSERT(descr < (word)GC_greatest_plausible_heap_addr
-			    - (word)GC_least_plausible_heap_addr);
-#	  ifdef PARALLEL_MARK
-#	    define SHARE_BYTES 2048
-	    if (descr > SHARE_BYTES && GC_parallel
-		&& mark_stack_top < mark_stack_limit - 1) {
-	      int new_size = (descr/2) & ~(sizeof(word)-1);
-	      mark_stack_top -> mse_start = current_p;
-	      mark_stack_top -> mse_descr = new_size + sizeof(word);
-					/* makes sure we handle 	*/
-					/* misaligned pointers.		*/
-	      mark_stack_top++;
-	      current_p = (word *) ((char *)current_p + new_size);
-	      descr -= new_size;
-	      goto retry;
-	    }
-#	  endif /* PARALLEL_MARK */
-          mark_stack_top -> mse_start =
-         	limit = current_p + SPLIT_RANGE_WORDS-1;
-          mark_stack_top -> mse_descr =
-          		descr - WORDS_TO_BYTES(SPLIT_RANGE_WORDS-1);
-          /* Make sure that pointers overlapping the two ranges are	*/
-          /* considered. 						*/
-          limit = (word *)((char *)limit + sizeof(word) - ALIGNMENT);
-          break;
-        case GC_DS_BITMAP:
-          mark_stack_top--;
-          descr &= ~GC_DS_TAGS;
-          credit -= WORDS_TO_BYTES(WORDSZ/2); /* guess */
-          while (descr != 0) {
-            if ((signed_word)descr < 0) {
-              current = *current_p;
-	      FIXUP_POINTER(current);
-	      if ((ptr_t)current >= least_ha && (ptr_t)current < greatest_ha) {
-		PREFETCH((ptr_t)current);
-                HC_PUSH_CONTENTS((ptr_t)current, mark_stack_top,
-			      mark_stack_limit, current_p, exit1);
-	      }
-            }
-	    descr <<= 1;
-	    ++ current_p;
-          }
-          continue;
-        case GC_DS_PROC:
-          mark_stack_top--;
-          credit -= GC_PROC_BYTES;
-          mark_stack_top =
-              (*PROC(descr))
-              	    (current_p, mark_stack_top,
-              	    mark_stack_limit, ENV(descr));
-          continue;
-        case GC_DS_PER_OBJECT:
-	  if ((signed_word)descr >= 0) {
-	    /* Descriptor is in the object.	*/
-            descr = *(word *)((ptr_t)current_p + descr - GC_DS_PER_OBJECT);
-	  } else {
-	    /* Descriptor is in type descriptor pointed to by first	*/
-	    /* word in object.						*/
-	    ptr_t type_descr = *(ptr_t *)current_p;
-	    /* type_descr is either a valid pointer to the descriptor	*/
-	    /* structure, or this object was on a free list.  If it 	*/
-	    /* it was anything but the last object on the free list,	*/
-	    /* we will misinterpret the next object on the free list as */
-	    /* the type descriptor, and get a 0 GC descriptor, which	*/
-	    /* is ideal.  Unfortunately, we need to check for the last	*/
-	    /* object case explicitly.					*/
-	    if (0 == type_descr) {
-		/* Rarely executed.	*/
-		mark_stack_top--;
-		continue;
-	    }
-            descr = *(word *)(type_descr
-			      - (descr - (GC_DS_PER_OBJECT
-					  - GC_INDIR_PER_OBJ_BIAS)));
-	  }
-	  if (0 == descr) {
-	      /* Can happen either because we generated a 0 descriptor	*/
-	      /* or we saw a pointer to a free object.			*/
-	      mark_stack_top--;
-	      continue;
-	  }
-          goto retry;
-      }
-    } else /* Small object with length descriptor */ {
-      mark_stack_top--;
-      limit = (word *)(((ptr_t)current_p) + (word)descr);
-    }
-    /* The simple case in which we're scanning a range.	*/
-    GC_ASSERT(!((word)current_p & (ALIGNMENT-1)));
-    credit -= (ptr_t)limit - (ptr_t)current_p;
-    limit -= 1;
-    {
-#     define PREF_DIST 4
-
-#     ifndef SMALL_CONFIG
-        word deferred;
-
-	/* Try to prefetch the next pointer to be examined asap.	*/
-	/* Empirically, this also seems to help slightly without	*/
-	/* prefetches, at least on linux/X86.  Presumably this loop 	*/
-	/* ends up with less register pressure, and gcc thus ends up 	*/
-	/* generating slightly better code.  Overall gcc code quality	*/
-	/* for this loop is still not great.				*/
-	for(;;) {
-	  PREFETCH((ptr_t)limit - PREF_DIST*CACHE_LINE_SIZE);
-	  GC_ASSERT(limit >= current_p);
-	  deferred = *limit;
-	  FIXUP_POINTER(deferred);
-	  limit = (word *)((char *)limit - ALIGNMENT);
-	  if ((ptr_t)deferred >= least_ha && (ptr_t)deferred <  greatest_ha) {
-	    PREFETCH((ptr_t)deferred);
-	    break;
-	  }
-	  if (current_p > limit) goto next_object;
-	  /* Unroll once, so we don't do too many of the prefetches 	*/
-	  /* based on limit.						*/
-	  deferred = *limit;
-	  FIXUP_POINTER(deferred);
-	  limit = (word *)((char *)limit - ALIGNMENT);
-	  if ((ptr_t)deferred >= least_ha && (ptr_t)deferred <  greatest_ha) {
-	    PREFETCH((ptr_t)deferred);
-	    break;
-	  }
-	  if (current_p > limit) goto next_object;
-	}
-#     endif
-
-      while (current_p <= limit) {
-	/* Empirically, unrolling this loop doesn't help a lot.	*/
-	/* Since HC_PUSH_CONTENTS expands to a lot of code,	*/
-	/* we don't.						*/
-        current = *current_p;
-	FIXUP_POINTER(current);
-        PREFETCH((ptr_t)current_p + PREF_DIST*CACHE_LINE_SIZE);
-        if ((ptr_t)current >= least_ha && (ptr_t)current <  greatest_ha) {
-  	  /* Prefetch the contents of the object we just pushed.  It's	*/
-  	  /* likely we will need them soon.				*/
-  	  PREFETCH((ptr_t)current);
-          HC_PUSH_CONTENTS((ptr_t)current, mark_stack_top,
-  		           mark_stack_limit, current_p, exit2);
-        }
-        current_p = (word *)((char *)current_p + ALIGNMENT);
-      }
-
-#     ifndef SMALL_CONFIG
-	/* We still need to mark the entry we previously prefetched.	*/
-	/* We alrady know that it passes the preliminary pointer	*/
-	/* validity test.						*/
-        HC_PUSH_CONTENTS((ptr_t)deferred, mark_stack_top,
-  		         mark_stack_limit, current_p, exit4);
-	next_object:;
-#     endif
-    }
-  }
-  return mark_stack_top;
-}
-
-#ifdef PARALLEL_MARK
-
-/* We assume we have an ANSI C Compiler.	*/
-GC_bool GC_help_wanted = FALSE;
-unsigned GC_helper_count = 0;
-unsigned GC_active_count = 0;
-mse * VOLATILE GC_first_nonempty;
-word GC_mark_no = 0;
-
-#define LOCAL_MARK_STACK_SIZE HBLKSIZE
-	/* Under normal circumstances, this is big enough to guarantee	*/
-	/* We don't overflow half of it in a single call to 		*/
-	/* GC_mark_from.						*/
-
-
-/* Steal mark stack entries starting at mse low into mark stack local	*/
-/* until we either steal mse high, or we have max entries.		*/
-/* Return a pointer to the top of the local mark stack.		        */
-/* *next is replaced by a pointer to the next unscanned mark stack	*/
-/* entry.								*/
-mse * GC_steal_mark_stack(mse * low, mse * high, mse * local,
-			  unsigned max, mse **next)
-{
-    mse *p;
-    mse *top = local - 1;
-    unsigned i = 0;
-
-    /* Make sure that prior writes to the mark stack are visible. */
-    /* On some architectures, the fact that the reads are 	  */
-    /* volatile should suffice.					  */
-#   if !defined(IA64) && !defined(HP_PA) && !defined(I386)
-      GC_memory_barrier();
-#   endif
-    GC_ASSERT(high >= low-1 && high - low + 1 <= GC_mark_stack_size);
-    for (p = low; p <= high && i <= max; ++p) {
-	word descr = *(volatile word *) &(p -> mse_descr);
-	/* In the IA64 memory model, the following volatile store is	*/
-	/* ordered after this read of descr.  Thus a thread must read 	*/
-	/* the original nonzero value.  HP_PA appears to be similar,	*/
-	/* and if I'm reading the P4 spec correctly, X86 is probably 	*/
-	/* also OK.  In some other cases we need a barrier.		*/
-#       if !defined(IA64) && !defined(HP_PA) && !defined(I386)
-          GC_memory_barrier();
-#       endif
-	if (descr != 0) {
-	    *(volatile word *) &(p -> mse_descr) = 0;
-	    /* More than one thread may get this entry, but that's only */
-	    /* a minor performance problem.				*/
-	    ++top;
-	    top -> mse_descr = descr;
-	    top -> mse_start = p -> mse_start;
-	    GC_ASSERT(  (top -> mse_descr & GC_DS_TAGS) != GC_DS_LENGTH || 
-			top -> mse_descr < (ptr_t)GC_greatest_plausible_heap_addr
-			                   - (ptr_t)GC_least_plausible_heap_addr);
-	    /* If this is a big object, count it as			*/
-	    /* size/256 + 1 objects.					*/
-	    ++i;
-	    if ((descr & GC_DS_TAGS) == GC_DS_LENGTH) i += (descr >> 8);
-	}
-    }
-    *next = p;
-    return top;
-}
-
-/* Copy back a local mark stack.	*/
-/* low and high are inclusive bounds.	*/
-void GC_return_mark_stack(mse * low, mse * high)
-{
-    mse * my_top;
-    mse * my_start;
-    size_t stack_size;
-
-    if (high < low) return;
-    stack_size = high - low + 1;
-    GC_acquire_mark_lock();
-    my_top = GC_mark_stack_top;
-    my_start = my_top + 1;
-    if (my_start - GC_mark_stack + stack_size > GC_mark_stack_size) {
-#     ifdef CONDPRINT
-	if (GC_print_stats) {
-	  GC_printf0("No room to copy back mark stack.");
-	}
-#     endif
-      GC_mark_state = MS_INVALID;
-      GC_mark_stack_too_small = TRUE;
-      /* We drop the local mark stack.  We'll fix things later.	*/
-    } else {
-      BCOPY(low, my_start, stack_size * sizeof(mse));
-      GC_ASSERT(GC_mark_stack_top = my_top);
-#     if !defined(IA64) && !defined(HP_PA)
-        GC_memory_barrier();
-#     endif
-	/* On IA64, the volatile write acts as a release barrier. */
-      GC_mark_stack_top = my_top + stack_size;
-    }
-    GC_release_mark_lock();
-    GC_notify_all_marker();
-}
-
-/* Mark from the local mark stack.		*/
-/* On return, the local mark stack is empty.	*/
-/* But this may be achieved by copying the	*/
-/* local mark stack back into the global one.	*/
-void GC_do_local_mark(mse *local_mark_stack, mse *local_top)
-{
-    unsigned n;
-#   define N_LOCAL_ITERS 1
-
-#   ifdef GC_ASSERTIONS
-      /* Make sure we don't hold mark lock. */
-	GC_acquire_mark_lock();
-	GC_release_mark_lock();
-#   endif
-    for (;;) {
-        for (n = 0; n < N_LOCAL_ITERS; ++n) {
-	    local_top = GC_mark_from(local_top, local_mark_stack,
-				     local_mark_stack + LOCAL_MARK_STACK_SIZE);
-	    if (local_top < local_mark_stack) return;
-	    if (local_top - local_mark_stack >= LOCAL_MARK_STACK_SIZE/2) {
-	 	GC_return_mark_stack(local_mark_stack, local_top);
-		return;
-	    }
-	}
-	if (GC_mark_stack_top < GC_first_nonempty &&
-	    GC_active_count < GC_helper_count
-	    && local_top > local_mark_stack + 1) {
-	    /* Try to share the load, since the main stack is empty,	*/
-	    /* and helper threads are waiting for a refill.		*/
-	    /* The entries near the bottom of the stack are likely	*/
-	    /* to require more work.  Thus we return those, eventhough	*/
-	    /* it's harder.						*/
-	    mse * p;
- 	    mse * new_bottom = local_mark_stack
-				+ (local_top - local_mark_stack)/2;
-	    GC_ASSERT(new_bottom > local_mark_stack
-		      && new_bottom < local_top);
-	    GC_return_mark_stack(local_mark_stack, new_bottom - 1);
-	    memmove(local_mark_stack, new_bottom,
-		    (local_top - new_bottom + 1) * sizeof(mse));
-	    local_top -= (new_bottom - local_mark_stack);
-	}
-    }
-}
-
-#define ENTRIES_TO_GET 5
-
-long GC_markers = 2;		/* Normally changed by thread-library-	*/
-				/* -specific code.			*/
-
-/* Mark using the local mark stack until the global mark stack is empty	*/
-/* and there are no active workers. Update GC_first_nonempty to reflect	*/
-/* progress.								*/
-/* Caller does not hold mark lock.					*/
-/* Caller has already incremented GC_helper_count.  We decrement it,	*/
-/* and maintain GC_active_count.					*/
-void GC_mark_local(mse *local_mark_stack, int id)
-{
-    mse * my_first_nonempty;
-
-    GC_acquire_mark_lock();
-    GC_active_count++;
-    my_first_nonempty = GC_first_nonempty;
-    GC_ASSERT(GC_first_nonempty >= GC_mark_stack && 
-	      GC_first_nonempty <= GC_mark_stack_top + 1);
-#   ifdef PRINTSTATS
-	GC_printf1("Starting mark helper %lu\n", (unsigned long)id);
-#   endif
-    GC_release_mark_lock();
-    for (;;) {
-  	size_t n_on_stack;
-        size_t n_to_get;
-	mse *next;
-	mse * my_top;
-	mse * local_top;
-        mse * global_first_nonempty = GC_first_nonempty;
-
-    	GC_ASSERT(my_first_nonempty >= GC_mark_stack && 
-		  my_first_nonempty <= GC_mark_stack_top + 1);
-    	GC_ASSERT(global_first_nonempty >= GC_mark_stack && 
-		  global_first_nonempty <= GC_mark_stack_top + 1);
-	if (my_first_nonempty < global_first_nonempty) {
-	    my_first_nonempty = global_first_nonempty;
-        } else if (global_first_nonempty < my_first_nonempty) {
-	    GC_compare_and_exchange((word *)(&GC_first_nonempty), 
-				   (word) global_first_nonempty,
-				   (word) my_first_nonempty);
-	    /* If this fails, we just go ahead, without updating	*/
-	    /* GC_first_nonempty.					*/
-	}
-	/* Perhaps we should also update GC_first_nonempty, if it */
-	/* is less.  But that would require using atomic updates. */
-	my_top = GC_mark_stack_top;
-	n_on_stack = my_top - my_first_nonempty + 1;
-        if (0 == n_on_stack) {
-	    GC_acquire_mark_lock();
-            my_top = GC_mark_stack_top;
-            n_on_stack = my_top - my_first_nonempty + 1;
-	    if (0 == n_on_stack) {
-		GC_active_count--;
-		GC_ASSERT(GC_active_count <= GC_helper_count);
-		/* Other markers may redeposit objects	*/
-		/* on the stack.				*/
-		if (0 == GC_active_count) GC_notify_all_marker();
-		while (GC_active_count > 0
-		       && GC_first_nonempty > GC_mark_stack_top) {
-		    /* We will be notified if either GC_active_count	*/
-		    /* reaches zero, or if more objects are pushed on	*/
-		    /* the global mark stack.				*/
-		    GC_wait_marker();
-		}
-		if (GC_active_count == 0 &&
-		    GC_first_nonempty > GC_mark_stack_top) { 
-		    GC_bool need_to_notify = FALSE;
-		    /* The above conditions can't be falsified while we	*/
-		    /* hold the mark lock, since neither 		*/
-		    /* GC_active_count nor GC_mark_stack_top can	*/
-		    /* change.  GC_first_nonempty can only be		*/
-		    /* incremented asynchronously.  Thus we know that	*/
-		    /* both conditions actually held simultaneously.	*/
-		    GC_helper_count--;
-		    if (0 == GC_helper_count) need_to_notify = TRUE;
-#		    ifdef PRINTSTATS
-		      GC_printf1(
-		        "Finished mark helper %lu\n", (unsigned long)id);
-#   		    endif
-		    GC_release_mark_lock();
-		    if (need_to_notify) GC_notify_all_marker();
-		    return;
-		}
-		/* else there's something on the stack again, or	*/
-		/* another helper may push something.			*/
-		GC_active_count++;
-	        GC_ASSERT(GC_active_count > 0);
-		GC_release_mark_lock();
-		continue;
-	    } else {
-		GC_release_mark_lock();
-	    }
-	}
-	n_to_get = ENTRIES_TO_GET;
-	if (n_on_stack < 2 * ENTRIES_TO_GET) n_to_get = 1;
-	local_top = GC_steal_mark_stack(my_first_nonempty, my_top,
-					local_mark_stack, n_to_get,
-				        &my_first_nonempty);
-        GC_ASSERT(my_first_nonempty >= GC_mark_stack && 
-	          my_first_nonempty <= GC_mark_stack_top + 1);
-	GC_do_local_mark(local_mark_stack, local_top);
-    }
-}
-
-/* Perform Parallel mark.			*/
-/* We hold the GC lock, not the mark lock.	*/
-/* Currently runs until the mark stack is	*/
-/* empty.					*/
-void GC_do_parallel_mark()
-{
-    mse local_mark_stack[LOCAL_MARK_STACK_SIZE];
-    mse * local_top;
-    mse * my_top;
-
-    GC_acquire_mark_lock();
-    GC_ASSERT(I_HOLD_LOCK());
-    /* This could be a GC_ASSERT, but it seems safer to keep it on	*/
-    /* all the time, especially since it's cheap.			*/
-    if (GC_help_wanted || GC_active_count != 0 || GC_helper_count != 0)
-	ABORT("Tried to start parallel mark in bad state");
-#   ifdef PRINTSTATS
-	GC_printf1("Starting marking for mark phase number %lu\n",
-		   (unsigned long)GC_mark_no);
-#   endif
-    GC_first_nonempty = GC_mark_stack;
-    GC_active_count = 0;
-    GC_helper_count = 1;
-    GC_help_wanted = TRUE;
-    GC_release_mark_lock();
-    GC_notify_all_marker();
-	/* Wake up potential helpers.	*/
-    GC_mark_local(local_mark_stack, 0);
-    GC_acquire_mark_lock();
-    GC_help_wanted = FALSE;
-    /* Done; clean up.	*/
-    while (GC_helper_count > 0) GC_wait_marker();
-    /* GC_helper_count cannot be incremented while GC_help_wanted == FALSE */
-#   ifdef PRINTSTATS
-	GC_printf1(
-	    "Finished marking for mark phase number %lu\n",
-	    (unsigned long)GC_mark_no);
-#   endif
-    GC_mark_no++;
-    GC_release_mark_lock();
-    GC_notify_all_marker();
-}
-
-
-/* Try to help out the marker, if it's running.	        */
-/* We do not hold the GC lock, but the requestor does.	*/
-void GC_help_marker(word my_mark_no)
-{
-    mse local_mark_stack[LOCAL_MARK_STACK_SIZE];
-    unsigned my_id;
-    mse * my_first_nonempty;
-
-    if (!GC_parallel) return;
-    GC_acquire_mark_lock();
-    while (GC_mark_no < my_mark_no
-           || !GC_help_wanted && GC_mark_no == my_mark_no) {
-      GC_wait_marker();
-    }
-    my_id = GC_helper_count;
-    if (GC_mark_no != my_mark_no || my_id >= GC_markers) {
-      /* Second test is useful only if original threads can also	*/
-      /* act as helpers.  Under Linux they can't.			*/
-      GC_release_mark_lock();
-      return;
-    }
-    GC_helper_count = my_id + 1;
-    GC_release_mark_lock();
-    GC_mark_local(local_mark_stack, my_id);
-    /* GC_mark_local decrements GC_helper_count. */
-}
-
-#endif /* PARALLEL_MARK */
-
-/* Allocate or reallocate space for mark stack of size s words  */
-/* May silently fail.						*/
-static void alloc_mark_stack(n)
-word n;
-{
-    mse * new_stack = (mse *)GC_scratch_alloc(n * sizeof(struct GC_ms_entry));
-    
-    GC_mark_stack_too_small = FALSE;
-    if (GC_mark_stack_size != 0) {
-        if (new_stack != 0) {
-          word displ = (word)GC_mark_stack & (GC_page_size - 1);
-          signed_word size = GC_mark_stack_size * sizeof(struct GC_ms_entry);
-          
-          /* Recycle old space */
-	      if (0 != displ) displ = GC_page_size - displ;
-	      size = (size - displ) & ~(GC_page_size - 1);
-	      if (size > 0) {
-	        GC_add_to_heap((struct hblk *)
-	      			((word)GC_mark_stack + displ), (word)size);
-	      }
-          GC_mark_stack = new_stack;
-          GC_mark_stack_size = n;
-	  GC_mark_stack_limit = new_stack + n;
-#	  ifdef CONDPRINT
-	    if (GC_print_stats) {
-	      GC_printf1("Grew mark stack to %lu frames\n",
-		    	 (unsigned long) GC_mark_stack_size);
-	    }
-#	  endif
-        } else {
-#	  ifdef CONDPRINT
-	    if (GC_print_stats) {
-	      GC_printf1("Failed to grow mark stack to %lu frames\n",
-		    	 (unsigned long) n);
-	    }
-#	  endif
-        }
-    } else {
-        if (new_stack == 0) {
-            GC_err_printf0("No space for mark stack\n");
-            EXIT();
-        }
-        GC_mark_stack = new_stack;
-        GC_mark_stack_size = n;
-	GC_mark_stack_limit = new_stack + n;
-    }
-    GC_mark_stack_top = GC_mark_stack-1;
-}
-
-void GC_mark_init()
-{
-    alloc_mark_stack(INITIAL_MARK_STACK_SIZE);
-}
-
-/*
- * Push all locations between b and t onto the mark stack.
- * b is the first location to be checked. t is one past the last
- * location to be checked.
- * Should only be used if there is no possibility of mark stack
- * overflow.
- */
-void GC_push_all(bottom, top)
-ptr_t bottom;
-ptr_t top;
-{
-    register word length;
-    
-    bottom = (ptr_t)(((word) bottom + ALIGNMENT-1) & ~(ALIGNMENT-1));
-    top = (ptr_t)(((word) top) & ~(ALIGNMENT-1));
-    if (top == 0 || bottom == top) return;
-    GC_mark_stack_top++;
-    if (GC_mark_stack_top >= GC_mark_stack_limit) {
-	ABORT("unexpected mark stack overflow");
-    }
-    length = top - bottom;
-#   if GC_DS_TAGS > ALIGNMENT - 1
-	length += GC_DS_TAGS;
-	length &= ~GC_DS_TAGS;
-#   endif
-    GC_mark_stack_top -> mse_start = (word *)bottom;
-    GC_mark_stack_top -> mse_descr = length;
-}
-
-/*
- * Analogous to the above, but push only those pages h with dirty_fn(h) != 0.
- * We use push_fn to actually push the block.
- * Used both to selectively push dirty pages, or to push a block
- * in piecemeal fashion, to allow for more marking concurrency.
- * Will not overflow mark stack if push_fn pushes a small fixed number
- * of entries.  (This is invoked only if push_fn pushes a single entry,
- * or if it marks each object before pushing it, thus ensuring progress
- * in the event of a stack overflow.)
- */
-void GC_push_selected(bottom, top, dirty_fn, push_fn)
-ptr_t bottom;
-ptr_t top;
-int (*dirty_fn) GC_PROTO((struct hblk * h));
-void (*push_fn) GC_PROTO((ptr_t bottom, ptr_t top));
-{
-    register struct hblk * h;
-
-    bottom = (ptr_t)(((long) bottom + ALIGNMENT-1) & ~(ALIGNMENT-1));
-    top = (ptr_t)(((long) top) & ~(ALIGNMENT-1));
-
-    if (top == 0 || bottom == top) return;
-    h = HBLKPTR(bottom + HBLKSIZE);
-    if (top <= (ptr_t) h) {
-  	if ((*dirty_fn)(h-1)) {
-	    (*push_fn)(bottom, top);
-	}
-	return;
-    }
-    if ((*dirty_fn)(h-1)) {
-        (*push_fn)(bottom, (ptr_t)h);
-    }
-    while ((ptr_t)(h+1) <= top) {
-	if ((*dirty_fn)(h)) {
-	    if ((word)(GC_mark_stack_top - GC_mark_stack)
-		> 3 * GC_mark_stack_size / 4) {
-	 	/* Danger of mark stack overflow */
-		(*push_fn)((ptr_t)h, top);
-		return;
-	    } else {
-		(*push_fn)((ptr_t)h, (ptr_t)(h+1));
-	    }
-	}
-	h++;
-    }
-    if ((ptr_t)h != top) {
-	if ((*dirty_fn)(h)) {
-            (*push_fn)((ptr_t)h, top);
-        }
-    }
-    if (GC_mark_stack_top >= GC_mark_stack_limit) {
-        ABORT("unexpected mark stack overflow");
-    }
-}
-
-# ifndef SMALL_CONFIG
-
-#ifdef PARALLEL_MARK
-    /* Break up root sections into page size chunks to better spread 	*/
-    /* out work.							*/
-    GC_bool GC_true_func(struct hblk *h) { return TRUE; }
-#   define GC_PUSH_ALL(b,t) GC_push_selected(b,t,GC_true_func,GC_push_all);
-#else
-#   define GC_PUSH_ALL(b,t) GC_push_all(b,t);
-#endif
-
-
-void GC_push_conditional(bottom, top, all)
-ptr_t bottom;
-ptr_t top;
-int all;
-{
-    if (all) {
-      if (GC_dirty_maintained) {
-#	ifdef PROC_VDB
-	    /* Pages that were never dirtied cannot contain pointers	*/
-	    GC_push_selected(bottom, top, GC_page_was_ever_dirty, GC_push_all);
-#	else
-	    GC_push_all(bottom, top);
-#	endif
-      } else {
-      	GC_push_all(bottom, top);
-      }
-    } else {
-	GC_push_selected(bottom, top, GC_page_was_dirty, GC_push_all);
-    }
-}
-#endif
-
-# if defined(MSWIN32) || defined(MSWINCE)
-  void __cdecl GC_push_one(p)
-# else
-  void GC_push_one(p)
-# endif
-word p;
-{
-    GC_PUSH_ONE_STACK(p, MARKED_FROM_REGISTER);
-}
-
-struct GC_ms_entry *GC_mark_and_push(obj, mark_stack_ptr, mark_stack_limit, src)
-GC_PTR obj;
-struct GC_ms_entry * mark_stack_ptr;
-struct GC_ms_entry * mark_stack_limit;
-GC_PTR *src;
-{
-   PREFETCH(obj);
-   PUSH_CONTENTS(obj, mark_stack_ptr /* modified */, mark_stack_limit, src,
-		 was_marked /* internally generated exit label */);
-   return mark_stack_ptr;
-}
-
-# ifdef __STDC__
-#   define BASE(p) (word)GC_base((void *)(p))
-# else
-#   define BASE(p) (word)GC_base((char *)(p))
-# endif
-
-/* Mark and push (i.e. gray) a single object p onto the main	*/
-/* mark stack.  Consider p to be valid if it is an interior	*/
-/* pointer.							*/
-/* The object p has passed a preliminary pointer validity	*/
-/* test, but we do not definitely know whether it is valid.	*/
-/* Mark bits are NOT atomically updated.  Thus this must be the	*/
-/* only thread setting them.					*/
-# if defined(PRINT_BLACK_LIST) || defined(KEEP_BACK_PTRS)
-    void GC_mark_and_push_stack(p, source)
-    ptr_t source;
-# else
-    void GC_mark_and_push_stack(p)
-#   define source 0
-# endif
-register word p;
-{
-    register word r;
-    register hdr * hhdr; 
-    register int displ;
-  
-    GET_HDR(p, hhdr);
-    if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-        if (hhdr != 0) {
-          r = BASE(p);
-	  hhdr = HDR(r);
-	  displ = BYTES_TO_WORDS(HBLKDISPL(r));
-	}
-    } else {
-        register map_entry_type map_entry;
-        
-        displ = HBLKDISPL(p);
-        map_entry = MAP_ENTRY((hhdr -> hb_map), displ);
-        if (map_entry >= MAX_OFFSET) {
-          if (map_entry == OFFSET_TOO_BIG || !GC_all_interior_pointers) {
-              r = BASE(p);
-	      displ = BYTES_TO_WORDS(HBLKDISPL(r));
-	      if (r == 0) hhdr = 0;
-          } else {
-	      /* Offset invalid, but map reflects interior pointers 	*/
-              hhdr = 0;
-          }
-        } else {
-          displ = BYTES_TO_WORDS(displ);
-          displ -= map_entry;
-          r = (word)((word *)(HBLKPTR(p)) + displ);
-        }
-    }
-    /* If hhdr != 0 then r == GC_base(p), only we did it faster. */
-    /* displ is the word index within the block.		 */
-    if (hhdr == 0) {
-#	ifdef PRINT_BLACK_LIST
-	  GC_add_to_black_list_stack(p, source);
-#	else
-	  GC_add_to_black_list_stack(p);
-#	endif
-#	undef source  /* In case we had to define it. */
-    } else {
-	if (!mark_bit_from_hdr(hhdr, displ)) {
-	    set_mark_bit_from_hdr(hhdr, displ);
- 	    GC_STORE_BACK_PTR(source, (ptr_t)r);
-	    PUSH_OBJ((word *)r, hhdr, GC_mark_stack_top,
-	             GC_mark_stack_limit);
-	}
-    }
-}
-
-# ifdef TRACE_BUF
-
-# define TRACE_ENTRIES 1000
-
-struct trace_entry {
-    char * kind;
-    word gc_no;
-    word words_allocd;
-    word arg1;
-    word arg2;
-} GC_trace_buf[TRACE_ENTRIES];
-
-int GC_trace_buf_ptr = 0;
-
-void GC_add_trace_entry(char *kind, word arg1, word arg2)
-{
-    GC_trace_buf[GC_trace_buf_ptr].kind = kind;
-    GC_trace_buf[GC_trace_buf_ptr].gc_no = GC_gc_no;
-    GC_trace_buf[GC_trace_buf_ptr].words_allocd = GC_words_allocd;
-    GC_trace_buf[GC_trace_buf_ptr].arg1 = arg1 ^ 0x80000000;
-    GC_trace_buf[GC_trace_buf_ptr].arg2 = arg2 ^ 0x80000000;
-    GC_trace_buf_ptr++;
-    if (GC_trace_buf_ptr >= TRACE_ENTRIES) GC_trace_buf_ptr = 0;
-}
-
-void GC_print_trace(word gc_no, GC_bool lock)
-{
-    int i;
-    struct trace_entry *p;
-    
-    if (lock) LOCK();
-    for (i = GC_trace_buf_ptr-1; i != GC_trace_buf_ptr; i--) {
-    	if (i < 0) i = TRACE_ENTRIES-1;
-    	p = GC_trace_buf + i;
-    	if (p -> gc_no < gc_no || p -> kind == 0) return;
-    	printf("Trace:%s (gc:%d,words:%d) 0x%X, 0x%X\n",
-    		p -> kind, p -> gc_no, p -> words_allocd,
-    		(p -> arg1) ^ 0x80000000, (p -> arg2) ^ 0x80000000);
-    }
-    printf("Trace incomplete\n");
-    if (lock) UNLOCK();
-}
-
-# endif /* TRACE_BUF */
-
-/*
- * A version of GC_push_all that treats all interior pointers as valid
- * and scans the entire region immediately, in case the contents
- * change.
- */
-void GC_push_all_eager(bottom, top)
-ptr_t bottom;
-ptr_t top;
-{
-    word * b = (word *)(((word) bottom + ALIGNMENT-1) & ~(ALIGNMENT-1));
-    word * t = (word *)(((word) top) & ~(ALIGNMENT-1));
-    register word *p;
-    register word q;
-    register word *lim;
-    register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-    register ptr_t least_ha = GC_least_plausible_heap_addr;
-#   define GC_greatest_plausible_heap_addr greatest_ha
-#   define GC_least_plausible_heap_addr least_ha
-
-    if (top == 0) return;
-    /* check all pointers in range and push if they appear	*/
-    /* to be valid.						*/
-      lim = t - 1 /* longword */;
-      for (p = b; p <= lim; p = (word *)(((char *)p) + ALIGNMENT)) {
-	q = *p;
-	GC_PUSH_ONE_STACK(q, p);
-      }
-#   undef GC_greatest_plausible_heap_addr
-#   undef GC_least_plausible_heap_addr
-}
-
-#ifndef THREADS
-/*
- * A version of GC_push_all that treats all interior pointers as valid
- * and scans part of the area immediately, to make sure that saved
- * register values are not lost.
- * Cold_gc_frame delimits the stack section that must be scanned
- * eagerly.  A zero value indicates that no eager scanning is needed.
- */
-void GC_push_all_stack_partially_eager(bottom, top, cold_gc_frame)
-ptr_t bottom;
-ptr_t top;
-ptr_t cold_gc_frame;
-{
-  if (!NEED_FIXUP_POINTER && GC_all_interior_pointers) {
-#   define EAGER_BYTES 1024
-    /* Push the hot end of the stack eagerly, so that register values   */
-    /* saved inside GC frames are marked before they disappear.		*/
-    /* The rest of the marking can be deferred until later.		*/
-    if (0 == cold_gc_frame) {
-	GC_push_all_stack(bottom, top);
-	return;
-    }
-    GC_ASSERT(bottom <= cold_gc_frame && cold_gc_frame <= top);
-#   ifdef STACK_GROWS_DOWN
-	GC_push_all(cold_gc_frame - sizeof(ptr_t), top);
-	GC_push_all_eager(bottom, cold_gc_frame);
-#   else /* STACK_GROWS_UP */
-	GC_push_all(bottom, cold_gc_frame + sizeof(ptr_t));
-	GC_push_all_eager(cold_gc_frame, top);
-#   endif /* STACK_GROWS_UP */
-  } else {
-    GC_push_all_eager(bottom, top);
-  }
-# ifdef TRACE_BUF
-      GC_add_trace_entry("GC_push_all_stack", bottom, top);
-# endif
-}
-#endif /* !THREADS */
-
-void GC_push_all_stack(bottom, top)
-ptr_t bottom;
-ptr_t top;
-{
-  if (!NEED_FIXUP_POINTER && GC_all_interior_pointers) {
-    GC_push_all(bottom, top);
-  } else {
-    GC_push_all_eager(bottom, top);
-  }
-}
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-/* Push all objects reachable from marked objects in the given block */
-/* of size 1 objects.						     */
-void GC_push_marked1(h, hhdr)
-struct hblk *h;
-register hdr * hhdr;
-{
-    word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p;
-    word *plim;
-    register int i;
-    register word q;
-    register word mark_word;
-    register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-    register ptr_t least_ha = GC_least_plausible_heap_addr;
-    register mse * mark_stack_top = GC_mark_stack_top;
-    register mse * mark_stack_limit = GC_mark_stack_limit;
-#   define GC_mark_stack_top mark_stack_top
-#   define GC_mark_stack_limit mark_stack_limit
-#   define GC_greatest_plausible_heap_addr greatest_ha
-#   define GC_least_plausible_heap_addr least_ha
-    
-    p = (word *)(h->hb_body);
-    plim = (word *)(((word)h) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    i = 0;
-	    while(mark_word != 0) {
-	      if (mark_word & 1) {
-	          q = p[i];
-	          GC_PUSH_ONE_HEAP(q, p + i);
-	      }
-	      i++;
-	      mark_word >>= 1;
-	    }
-	    p += WORDSZ;
-	}
-#   undef GC_greatest_plausible_heap_addr
-#   undef GC_least_plausible_heap_addr        
-#   undef GC_mark_stack_top
-#   undef GC_mark_stack_limit
-    GC_mark_stack_top = mark_stack_top;
-}
-
-
-#ifndef UNALIGNED
-
-/* Push all objects reachable from marked objects in the given block */
-/* of size 2 objects.						     */
-void GC_push_marked2(h, hhdr)
-struct hblk *h;
-register hdr * hhdr;
-{
-    word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p;
-    word *plim;
-    register int i;
-    register word q;
-    register word mark_word;
-    register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-    register ptr_t least_ha = GC_least_plausible_heap_addr;
-    register mse * mark_stack_top = GC_mark_stack_top;
-    register mse * mark_stack_limit = GC_mark_stack_limit;
-#   define GC_mark_stack_top mark_stack_top
-#   define GC_mark_stack_limit mark_stack_limit
-#   define GC_greatest_plausible_heap_addr greatest_ha
-#   define GC_least_plausible_heap_addr least_ha
-    
-    p = (word *)(h->hb_body);
-    plim = (word *)(((word)h) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    i = 0;
-	    while(mark_word != 0) {
-	      if (mark_word & 1) {
-	          q = p[i];
-	          GC_PUSH_ONE_HEAP(q, p + i);
-	          q = p[i+1];
-	          GC_PUSH_ONE_HEAP(q, p + i);
-	      }
-	      i += 2;
-	      mark_word >>= 2;
-	    }
-	    p += WORDSZ;
-	}
-#   undef GC_greatest_plausible_heap_addr
-#   undef GC_least_plausible_heap_addr        
-#   undef GC_mark_stack_top
-#   undef GC_mark_stack_limit
-    GC_mark_stack_top = mark_stack_top;
-}
-
-/* Push all objects reachable from marked objects in the given block */
-/* of size 4 objects.						     */
-/* There is a risk of mark stack overflow here.  But we handle that. */
-/* And only unmarked objects get pushed, so it's not very likely.    */
-void GC_push_marked4(h, hhdr)
-struct hblk *h;
-register hdr * hhdr;
-{
-    word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p;
-    word *plim;
-    register int i;
-    register word q;
-    register word mark_word;
-    register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-    register ptr_t least_ha = GC_least_plausible_heap_addr;
-    register mse * mark_stack_top = GC_mark_stack_top;
-    register mse * mark_stack_limit = GC_mark_stack_limit;
-#   define GC_mark_stack_top mark_stack_top
-#   define GC_mark_stack_limit mark_stack_limit
-#   define GC_greatest_plausible_heap_addr greatest_ha
-#   define GC_least_plausible_heap_addr least_ha
-    
-    p = (word *)(h->hb_body);
-    plim = (word *)(((word)h) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    i = 0;
-	    while(mark_word != 0) {
-	      if (mark_word & 1) {
-	          q = p[i];
-	          GC_PUSH_ONE_HEAP(q, p + i);
-	          q = p[i+1];
-	          GC_PUSH_ONE_HEAP(q, p + i + 1);
-	          q = p[i+2];
-	          GC_PUSH_ONE_HEAP(q, p + i + 2);
-	          q = p[i+3];
-	          GC_PUSH_ONE_HEAP(q, p + i + 3);
-	      }
-	      i += 4;
-	      mark_word >>= 4;
-	    }
-	    p += WORDSZ;
-	}
-#   undef GC_greatest_plausible_heap_addr
-#   undef GC_least_plausible_heap_addr        
-#   undef GC_mark_stack_top
-#   undef GC_mark_stack_limit
-    GC_mark_stack_top = mark_stack_top;
-}
-
-#endif /* UNALIGNED */
-
-#endif /* SMALL_CONFIG */
-
-/* Push all objects reachable from marked objects in the given block */
-void GC_push_marked(h, hhdr)
-struct hblk *h;
-register hdr * hhdr;
-{
-    register int sz = hhdr -> hb_sz;
-    register int descr = hhdr -> hb_descr;
-    register word * p;
-    register int word_no;
-    register word * lim;
-    register mse * GC_mark_stack_top_reg;
-    register mse * mark_stack_limit = GC_mark_stack_limit;
-    
-    /* Some quick shortcuts: */
-	if ((0 | GC_DS_LENGTH) == descr) return;
-        if (GC_block_empty(hhdr)/* nothing marked */) return;
-    GC_n_rescuing_pages++;
-    GC_objects_are_marked = TRUE;
-    if (sz > MAXOBJSZ) {
-        lim = (word *)h;
-    } else {
-        lim = (word *)(h + 1) - sz;
-    }
-    
-    switch(sz) {
-#   if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)   
-     case 1:
-       GC_push_marked1(h, hhdr);
-       break;
-#   endif
-#   if !defined(SMALL_CONFIG) && !defined(UNALIGNED) && \
-       !defined(USE_MARK_BYTES)
-     case 2:
-       GC_push_marked2(h, hhdr);
-       break;
-     case 4:
-       GC_push_marked4(h, hhdr);
-       break;
-#   endif       
-     default:
-      GC_mark_stack_top_reg = GC_mark_stack_top;
-      for (p = (word *)h, word_no = 0; p <= lim; p += sz, word_no += sz) {
-         if (mark_bit_from_hdr(hhdr, word_no)) {
-           /* Mark from fields inside the object */
-             PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top_reg, mark_stack_limit);
-#	     ifdef GATHERSTATS
-		/* Subtract this object from total, since it was	*/
-		/* added in twice.					*/
-		GC_composite_in_use -= sz;
-#	     endif
-         }
-      }
-      GC_mark_stack_top = GC_mark_stack_top_reg;
-    }
-}
-
-#ifndef SMALL_CONFIG
-/* Test whether any page in the given block is dirty	*/
-GC_bool GC_block_was_dirty(h, hhdr)
-struct hblk *h;
-register hdr * hhdr;
-{
-    register int sz = hhdr -> hb_sz;
-    
-    if (sz <= MAXOBJSZ) {
-         return(GC_page_was_dirty(h));
-    } else {
-    	 register ptr_t p = (ptr_t)h;
-         sz = WORDS_TO_BYTES(sz);
-         while (p < (ptr_t)h + sz) {
-             if (GC_page_was_dirty((struct hblk *)p)) return(TRUE);
-             p += HBLKSIZE;
-         }
-         return(FALSE);
-    }
-}
-#endif /* SMALL_CONFIG */
-
-/* Similar to GC_push_next_marked, but return address of next block	*/
-struct hblk * GC_push_next_marked(h)
-struct hblk *h;
-{
-    register hdr * hhdr;
-    
-    h = GC_next_used_block(h);
-    if (h == 0) return(0);
-    hhdr = HDR(h);
-    GC_push_marked(h, hhdr);
-    return(h + OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz));
-}
-
-#ifndef SMALL_CONFIG
-/* Identical to above, but mark only from dirty pages	*/
-struct hblk * GC_push_next_marked_dirty(h)
-struct hblk *h;
-{
-    register hdr * hhdr;
-    
-    if (!GC_dirty_maintained) { ABORT("dirty bits not set up"); }
-    for (;;) {
-        h = GC_next_used_block(h);
-        if (h == 0) return(0);
-        hhdr = HDR(h);
-#	ifdef STUBBORN_ALLOC
-          if (hhdr -> hb_obj_kind == STUBBORN) {
-            if (GC_page_was_changed(h) && GC_block_was_dirty(h, hhdr)) {
-                break;
-            }
-          } else {
-            if (GC_block_was_dirty(h, hhdr)) break;
-          }
-#	else
-	  if (GC_block_was_dirty(h, hhdr)) break;
-#	endif
-        h += OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz);
-    }
-    GC_push_marked(h, hhdr);
-    return(h + OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz));
-}
-#endif
-
-/* Similar to above, but for uncollectable pages.  Needed since we	*/
-/* do not clear marks for such pages, even for full collections.	*/
-struct hblk * GC_push_next_marked_uncollectable(h)
-struct hblk *h;
-{
-    register hdr * hhdr = HDR(h);
-    
-    for (;;) {
-        h = GC_next_used_block(h);
-        if (h == 0) return(0);
-        hhdr = HDR(h);
-	if (hhdr -> hb_obj_kind == UNCOLLECTABLE) break;
-        h += OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz);
-    }
-    GC_push_marked(h, hhdr);
-    return(h + OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz));
-}
-
-
diff --git a/boehm-gc/mark_rts.c b/boehm-gc/mark_rts.c
deleted file mode 100644
index 94eb0ddb37f..00000000000
--- a/boehm-gc/mark_rts.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-# include <stdio.h>
-# include "private/gc_priv.h"
-
-/* Data structure for list of root sets.				*/
-/* We keep a hash table, so that we can filter out duplicate additions.	*/
-/* Under Win32, we need to do a better job of filtering overlaps, so	*/
-/* we resort to sequential search, and pay the price.			*/
-/* This is really declared in gc_priv.h:
-struct roots {
-	ptr_t r_start;
-	ptr_t r_end;
- #	if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-	  struct roots * r_next;
- #	endif
-	GC_bool r_tmp;
-	  	-- Delete before registering new dynamic libraries
-};
-
-struct roots GC_static_roots[MAX_ROOT_SETS];
-*/
-
-int GC_no_dls = 0;	/* Register dynamic library data segments.	*/
-
-static int n_root_sets = 0;
-
-	/* GC_static_roots[0..n_root_sets) contains the valid root sets. */
-
-# if !defined(NO_DEBUGGING)
-/* For debugging:	*/
-void GC_print_static_roots()
-{
-    register int i;
-    size_t total = 0;
-    
-    for (i = 0; i < n_root_sets; i++) {
-        GC_printf2("From 0x%lx to 0x%lx ",
-        	   (unsigned long) GC_static_roots[i].r_start,
-        	   (unsigned long) GC_static_roots[i].r_end);
-        if (GC_static_roots[i].r_tmp) {
-            GC_printf0(" (temporary)\n");
-        } else {
-            GC_printf0("\n");
-        }
-        total += GC_static_roots[i].r_end - GC_static_roots[i].r_start;
-    }
-    GC_printf1("Total size: %ld\n", (unsigned long) total);
-    if (GC_root_size != total) {
-     	GC_printf1("GC_root_size incorrect: %ld!!\n",
-     		   (unsigned long) GC_root_size);
-    }
-}
-# endif /* NO_DEBUGGING */
-
-/* Primarily for debugging support:	*/
-/* Is the address p in one of the registered static			*/
-/* root sections?							*/
-GC_bool GC_is_static_root(p)
-ptr_t p;
-{
-    static int last_root_set = MAX_ROOT_SETS;
-    register int i;
-    
-    
-    if (last_root_set < n_root_sets
-	&& p >= GC_static_roots[last_root_set].r_start
-        && p < GC_static_roots[last_root_set].r_end) return(TRUE);
-    for (i = 0; i < n_root_sets; i++) {
-    	if (p >= GC_static_roots[i].r_start
-            && p < GC_static_roots[i].r_end) {
-            last_root_set = i;
-            return(TRUE);
-        }
-    }
-    return(FALSE);
-}
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-/* 
-#   define LOG_RT_SIZE 6
-#   define RT_SIZE (1 << LOG_RT_SIZE)  -- Power of 2, may be != MAX_ROOT_SETS
-
-    struct roots * GC_root_index[RT_SIZE];
-	-- Hash table header.  Used only to check whether a range is
-	-- already present.
-	-- really defined in gc_priv.h
-*/
-
-static int rt_hash(addr)
-char * addr;
-{
-    word result = (word) addr;
-#   if CPP_WORDSZ > 8*LOG_RT_SIZE
-	result ^= result >> 8*LOG_RT_SIZE;
-#   endif
-#   if CPP_WORDSZ > 4*LOG_RT_SIZE
-	result ^= result >> 4*LOG_RT_SIZE;
-#   endif
-    result ^= result >> 2*LOG_RT_SIZE;
-    result ^= result >> LOG_RT_SIZE;
-    result &= (RT_SIZE-1);
-    return(result);
-}
-
-/* Is a range starting at b already in the table? If so return a	*/
-/* pointer to it, else NIL.						*/
-struct roots * GC_roots_present(b)
-char *b;
-{
-    register int h = rt_hash(b);
-    register struct roots *p = GC_root_index[h];
-    
-    while (p != 0) {
-        if (p -> r_start == (ptr_t)b) return(p);
-        p = p -> r_next;
-    }
-    return(FALSE);
-}
-
-/* Add the given root structure to the index. */
-static void add_roots_to_index(p)
-struct roots *p;
-{
-    register int h = rt_hash(p -> r_start);
-    
-    p -> r_next = GC_root_index[h];
-    GC_root_index[h] = p;
-}
-
-# else /* MSWIN32 || MSWINCE || CYGWIN32 */
-
-#   define add_roots_to_index(p)
-
-# endif
-
-
-
-
-word GC_root_size = 0;
-
-void GC_add_roots(b, e)
-char * b; char * e;
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    GC_add_roots_inner(b, e, FALSE);
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-
-/* Add [b,e) to the root set.  Adding the same interval a second time	*/
-/* is a moderately fast noop, and hence benign.  We do not handle	*/
-/* different but overlapping intervals efficiently.  (We do handle	*/
-/* them correctly.)							*/
-/* Tmp specifies that the interval may be deleted before 		*/
-/* reregistering dynamic libraries.					*/ 
-void GC_add_roots_inner(b, e, tmp)
-char * b; char * e;
-GC_bool tmp;
-{
-    struct roots * old;
-    
-#   if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-      /* Spend the time to ensure that there are no overlapping	*/
-      /* or adjacent intervals.					*/
-      /* This could be done faster with e.g. a			*/
-      /* balanced tree.  But the execution time here is		*/
-      /* virtually guaranteed to be dominated by the time it	*/
-      /* takes to scan the roots.				*/
-      {
-        register int i;
-        
-        for (i = 0; i < n_root_sets; i++) {
-            old = GC_static_roots + i;
-            if ((ptr_t)b <= old -> r_end && (ptr_t)e >= old -> r_start) {
-                if ((ptr_t)b < old -> r_start) {
-                    old -> r_start = (ptr_t)b;
-                    GC_root_size += (old -> r_start - (ptr_t)b);
-                }
-                if ((ptr_t)e > old -> r_end) {
-                    old -> r_end = (ptr_t)e;
-                    GC_root_size += ((ptr_t)e - old -> r_end);
-                }
-                old -> r_tmp &= tmp;
-                break;
-            }
-        }
-        if (i < n_root_sets) {
-          /* merge other overlapping intervals */
-            struct roots *other;
-            
-            for (i++; i < n_root_sets; i++) {
-              other = GC_static_roots + i;
-              b = (char *)(other -> r_start);
-              e = (char *)(other -> r_end);
-              if ((ptr_t)b <= old -> r_end && (ptr_t)e >= old -> r_start) {
-                if ((ptr_t)b < old -> r_start) {
-                    old -> r_start = (ptr_t)b;
-                    GC_root_size += (old -> r_start - (ptr_t)b);
-                }
-                if ((ptr_t)e > old -> r_end) {
-                    old -> r_end = (ptr_t)e;
-                    GC_root_size += ((ptr_t)e - old -> r_end);
-                }
-                old -> r_tmp &= other -> r_tmp;
-                /* Delete this entry. */
-                  GC_root_size -= (other -> r_end - other -> r_start);
-                  other -> r_start = GC_static_roots[n_root_sets-1].r_start;
-                  other -> r_end = GC_static_roots[n_root_sets-1].r_end;
-                                  n_root_sets--;
-              }
-            }
-          return;
-        }
-      }
-#   else
-      old = GC_roots_present(b);
-      if (old != 0) {
-        if ((ptr_t)e <= old -> r_end) /* already there */ return;
-        /* else extend */
-        GC_root_size += (ptr_t)e - old -> r_end;
-        old -> r_end = (ptr_t)e;
-        return;
-      }
-#   endif
-    if (n_root_sets == MAX_ROOT_SETS) {
-        ABORT("Too many root sets\n");
-    }
-    GC_static_roots[n_root_sets].r_start = (ptr_t)b;
-    GC_static_roots[n_root_sets].r_end = (ptr_t)e;
-    GC_static_roots[n_root_sets].r_tmp = tmp;
-#   if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-      GC_static_roots[n_root_sets].r_next = 0;
-#   endif
-    add_roots_to_index(GC_static_roots + n_root_sets);
-    GC_root_size += (ptr_t)e - (ptr_t)b;
-    n_root_sets++;
-}
-
-static GC_bool roots_were_cleared = FALSE;
-
-void GC_clear_roots GC_PROTO((void))
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    roots_were_cleared = TRUE;
-    n_root_sets = 0;
-    GC_root_size = 0;
-#   if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-    {
-    	register int i;
-    	
-    	for (i = 0; i < RT_SIZE; i++) GC_root_index[i] = 0;
-    }
-#   endif
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-/* Internal use only; lock held.	*/
-static void GC_remove_root_at_pos(i) 
-int i;
-{
-    GC_root_size -= (GC_static_roots[i].r_end - GC_static_roots[i].r_start);
-    GC_static_roots[i].r_start = GC_static_roots[n_root_sets-1].r_start;
-    GC_static_roots[i].r_end = GC_static_roots[n_root_sets-1].r_end;
-    GC_static_roots[i].r_tmp = GC_static_roots[n_root_sets-1].r_tmp;
-    n_root_sets--;
-}
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-static void GC_rebuild_root_index()
-{
-    register int i;
-    	
-    for (i = 0; i < RT_SIZE; i++) GC_root_index[i] = 0;
-    for (i = 0; i < n_root_sets; i++)
-	add_roots_to_index(GC_static_roots + i);
-}
-#endif
-
-/* Internal use only; lock held.	*/
-void GC_remove_tmp_roots()
-{
-    register int i;
-    
-    for (i = 0; i < n_root_sets; ) {
-    	if (GC_static_roots[i].r_tmp) {
-            GC_remove_root_at_pos(i);
-    	} else {
-    	    i++;
-    }
-    }
-    #if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-    GC_rebuild_root_index();
-    #endif
-}
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32)
-void GC_remove_roots(b, e)
-char * b; char * e;
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    GC_remove_roots_inner(b, e);
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-/* Should only be called when the lock is held */
-void GC_remove_roots_inner(b,e)
-char * b; char * e;
-{
-    int i;
-    for (i = 0; i < n_root_sets; ) {
-    	if (GC_static_roots[i].r_start >= (ptr_t)b && GC_static_roots[i].r_end <= (ptr_t)e) {
-            GC_remove_root_at_pos(i);
-    	} else {
-    	    i++;
-    	}
-    }
-    GC_rebuild_root_index();
-}
-#endif /* !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) */
-
-#if defined(MSWIN32) || defined(_WIN32_WCE_EMULATION) || defined(CYGWIN32)
-/* Workaround for the OS mapping and unmapping behind our back:		*/
-/* Is the address p in one of the temporary static root sections?	*/
-GC_bool GC_is_tmp_root(p)
-ptr_t p;
-{
-    static int last_root_set = MAX_ROOT_SETS;
-    register int i;
-    
-    if (last_root_set < n_root_sets
-	&& p >= GC_static_roots[last_root_set].r_start
-        && p < GC_static_roots[last_root_set].r_end)
-	return GC_static_roots[last_root_set].r_tmp;
-    for (i = 0; i < n_root_sets; i++) {
-    	if (p >= GC_static_roots[i].r_start
-            && p < GC_static_roots[i].r_end) {
-            last_root_set = i;
-            return GC_static_roots[i].r_tmp;
-        }
-    }
-    return(FALSE);
-}
-#endif /* MSWIN32 || _WIN32_WCE_EMULATION || defined(CYGWIN32) */
-
-ptr_t GC_approx_sp()
-{
-    VOLATILE word dummy;
-
-    dummy = 42;	/* Force stack to grow if necessary.	Otherwise the	*/
-    		/* later accesses might cause the kernel to think we're	*/
-    		/* doing something wrong.				*/
-#   ifdef _MSC_VER
-#     pragma warning(disable:4172)
-#   endif
-#ifdef __GNUC__
-    /* Eliminate a warning from GCC about taking the address of a
-       local variable.  */
-    return __builtin_frame_address (0);
-#else
-    return ((ptr_t)(&dummy));
-#endif /* __GNUC__ */
-#   ifdef _MSC_VER
-#     pragma warning(default:4172)
-#   endif
-}
-
-/*
- * Data structure for excluded static roots.
- * Real declaration is in gc_priv.h.
-
-struct exclusion {
-    ptr_t e_start;
-    ptr_t e_end;
-};
-
-struct exclusion GC_excl_table[MAX_EXCLUSIONS];
-					-- Array of exclusions, ascending
-					-- address order.
-*/
-
-size_t GC_excl_table_entries = 0;	/* Number of entries in use.	  */
-
-/* Return the first exclusion range that includes an address >= start_addr */
-/* Assumes the exclusion table contains at least one entry (namely the	   */
-/* GC data structures).							   */
-struct exclusion * GC_next_exclusion(start_addr)
-ptr_t start_addr;
-{
-    size_t low = 0;
-    size_t high = GC_excl_table_entries - 1;
-    size_t mid;
-
-    while (high > low) {
-	mid = (low + high) >> 1;
-	/* low <= mid < high	*/
-	if ((word) GC_excl_table[mid].e_end <= (word) start_addr) {
-	    low = mid + 1;
-	} else {
-	    high = mid;
-	}
-    }
-    if ((word) GC_excl_table[low].e_end <= (word) start_addr) return 0;
-    return GC_excl_table + low;
-}
-
-void GC_exclude_static_roots(start, finish)
-GC_PTR start;
-GC_PTR finish;
-{
-    struct exclusion * next;
-    size_t next_index, i;
-
-    if (0 == GC_excl_table_entries) {
-	next = 0;
-    } else {
-	next = GC_next_exclusion(start);
-    }
-    if (0 != next) {
-      if ((word)(next -> e_start) < (word) finish) {
-	/* incomplete error check. */
-	ABORT("exclusion ranges overlap");
-      }  
-      if ((word)(next -> e_start) == (word) finish) {
-        /* extend old range backwards	*/
-          next -> e_start = (ptr_t)start;
-	  return;
-      }
-      next_index = next - GC_excl_table;
-      for (i = GC_excl_table_entries; i > next_index; --i) {
-	GC_excl_table[i] = GC_excl_table[i-1];
-      }
-    } else {
-      next_index = GC_excl_table_entries;
-    }
-    if (GC_excl_table_entries == MAX_EXCLUSIONS) ABORT("Too many exclusions");
-    GC_excl_table[next_index].e_start = (ptr_t)start;
-    GC_excl_table[next_index].e_end = (ptr_t)finish;
-    ++GC_excl_table_entries;
-}
-
-/* Invoke push_conditional on ranges that are not excluded. */
-void GC_push_conditional_with_exclusions(bottom, top, all)
-ptr_t bottom;
-ptr_t top;
-int all;
-{
-    struct exclusion * next;
-    ptr_t excl_start;
-
-    while (bottom < top) {
-        next = GC_next_exclusion(bottom);
-	if (0 == next || (excl_start = next -> e_start) >= top) {
-	    GC_push_conditional(bottom, top, all);
-	    return;
-	}
-	if (excl_start > bottom) GC_push_conditional(bottom, excl_start, all);
-	bottom = next -> e_end;
-    }
-}
-
-/*
- * In the absence of threads, push the stack contents.
- * In the presence of threads, push enough of the current stack
- * to ensure that callee-save registers saved in collector frames have been
- * seen.
- */
-void GC_push_current_stack(cold_gc_frame)
-ptr_t cold_gc_frame;
-{
-#   if defined(THREADS)
-	if (0 == cold_gc_frame) return;
-#       ifdef STACK_GROWS_DOWN
-    	  GC_push_all_eager(GC_approx_sp(), cold_gc_frame);
-	  /* For IA64, the register stack backing store is handled 	*/
-	  /* in the thread-specific code.				*/
-#       else
-	  GC_push_all_eager( cold_gc_frame, GC_approx_sp() );
-#       endif
-#   else
-#   	ifdef STACK_GROWS_DOWN
-    	    GC_push_all_stack_partially_eager( GC_approx_sp(), GC_stackbottom,
-					       cold_gc_frame );
-#	    ifdef IA64
-	      /* We also need to push the register stack backing store. */
-	      /* This should really be done in the same way as the	*/
-	      /* regular stack.  For now we fudge it a bit.		*/
-	      /* Note that the backing store grows up, so we can't use	*/
-	      /* GC_push_all_stack_partially_eager.			*/
-	      {
-		extern word GC_save_regs_ret_val;
-			/* Previously set to backing store pointer.	*/
-		ptr_t bsp = (ptr_t) GC_save_regs_ret_val;
-	        ptr_t cold_gc_bs_pointer;
-		if (GC_all_interior_pointers) {
-	          cold_gc_bs_pointer = bsp - 2048;
-		  if (cold_gc_bs_pointer < BACKING_STORE_BASE) {
-		    cold_gc_bs_pointer = BACKING_STORE_BASE;
-		  } else {
-		    GC_push_all_stack(BACKING_STORE_BASE, cold_gc_bs_pointer);
-		  }
-		} else {
-		  cold_gc_bs_pointer = BACKING_STORE_BASE;
-		}
-		GC_push_all_eager(cold_gc_bs_pointer, bsp);
-		/* All values should be sufficiently aligned that we	*/
-		/* dont have to worry about the boundary.		*/
-	      }
-#	    endif
-#       else
-	    GC_push_all_stack_partially_eager( GC_stackbottom, GC_approx_sp(),
-					       cold_gc_frame );
-#       endif
-#   endif /* !THREADS */
-}
-
-/*
- * Push GC internal roots.  Only called if there is some reason to believe
- * these would not otherwise get registered.
- */
-void GC_push_gc_structures GC_PROTO((void))
-{
-    GC_push_finalizer_structures();
-    GC_push_stubborn_structures();
-#   if defined(THREADS)
-      GC_push_thread_structures();
-#   endif
-}
-
-#ifdef THREAD_LOCAL_ALLOC
-  void GC_mark_thread_local_free_lists();
-#endif
-
-void GC_cond_register_dynamic_libraries()
-{
-# if (defined(DYNAMIC_LOADING) || defined(MSWIN32) || defined(MSWINCE) \
-     || defined(CYGWIN32) || defined(PCR)) && !defined(SRC_M3)
-    GC_remove_tmp_roots();
-    if (!GC_no_dls) GC_register_dynamic_libraries();
-# else
-    GC_no_dls = TRUE;
-# endif
-}
-
-/*
- * Call the mark routines (GC_tl_push for a single pointer, GC_push_conditional
- * on groups of pointers) on every top level accessible pointer.
- * If all is FALSE, arrange to push only possibly altered values.
- * Cold_gc_frame is an address inside a GC frame that
- * remains valid until all marking is complete.
- * A zero value indicates that it's OK to miss some
- * register values.
- */
-void GC_push_roots(all, cold_gc_frame)
-GC_bool all;
-ptr_t cold_gc_frame;
-{
-    int i;
-    int kind;
-
-    /*
-     * Next push static data.  This must happen early on, since it's
-     * not robust against mark stack overflow.
-     */
-     /* Reregister dynamic libraries, in case one got added.		*/
-     /* There is some argument for doing this as late as possible,	*/
-     /* especially on win32, where it can change asynchronously.	*/
-     /* In those cases, we do it here.  But on other platforms, it's	*/
-     /* not safe with the world stopped, so we do it earlier.		*/
-#      if !defined(REGISTER_LIBRARIES_EARLY)
-         GC_cond_register_dynamic_libraries();
-#      endif
-
-     /* Mark everything in static data areas                             */
-       for (i = 0; i < n_root_sets; i++) {
-         GC_push_conditional_with_exclusions(
-			     GC_static_roots[i].r_start,
-			     GC_static_roots[i].r_end, all);
-       }
-
-     /* Mark all free list header blocks, if those were allocated from	*/
-     /* the garbage collected heap.  This makes sure they don't 	*/
-     /* disappear if we are not marking from static data.  It also 	*/
-     /* saves us the trouble of scanning them, and possibly that of	*/
-     /* marking the freelists.						*/
-       for (kind = 0; kind < GC_n_kinds; kind++) {
-	 GC_PTR base = GC_base(GC_obj_kinds[kind].ok_freelist);
-	 if (0 != base) {
-	   GC_set_mark_bit(base);
-	 }
-       }
-       
-     /* Mark from GC internal roots if those might otherwise have	*/
-     /* been excluded.							*/
-       if (GC_no_dls || roots_were_cleared) {
-	   GC_push_gc_structures();
-       }
-
-     /* Mark thread local free lists, even if their mark 	*/
-     /* descriptor excludes the link field.			*/
-     /* If the world is not stopped, this is unsafe.  It is	*/
-     /* also unnecessary, since we will do this again with the	*/
-     /* world stopped.						*/
-#      ifdef THREAD_LOCAL_ALLOC
-         if (GC_world_stopped) GC_mark_thread_local_free_lists();
-#      endif
-
-    /*
-     * Now traverse stacks, and mark from register contents.
-     * These must be done last, since they can legitimately overflow
-     * the mark stack.
-     */
-#   ifdef USE_GENERIC_PUSH_REGS
-	GC_generic_push_regs(cold_gc_frame);
-	/* Also pushes stack, so that we catch callee-save registers	*/
-	/* saved inside the GC_push_regs frame.				*/
-#   else
-       /*
-        * push registers - i.e., call GC_push_one(r) for each
-        * register contents r.
-        */
-        GC_push_regs(); /* usually defined in machine_dep.c */
-	GC_push_current_stack(cold_gc_frame);
-	/* In the threads case, this only pushes collector frames.      */
-	/* In the case of linux threads on IA64, the hot section of	*/
-	/* the main stack is marked here, but the register stack	*/
-	/* backing store is handled in the threads-specific code.	*/
-#   endif
-    if (GC_push_other_roots != 0) (*GC_push_other_roots)();
-    	/* In the threads case, this also pushes thread stacks.	*/
-        /* Note that without interior pointer recognition lots	*/
-    	/* of stuff may have been pushed already, and this	*/
-    	/* should be careful about mark stack overflows.	*/
-}
-
diff --git a/boehm-gc/mips_sgi_mach_dep.s b/boehm-gc/mips_sgi_mach_dep.s
deleted file mode 100644
index cadacf5ed4d..00000000000
--- a/boehm-gc/mips_sgi_mach_dep.s
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <sys/regdef.h>
-#include <sys/asm.h>
-/* This file must be preprocessed.  But the SGI assembler always does	*/
-/* that.  Furthermore, a generic preprocessor won't do, since some of	*/
-/* the SGI-supplied include files rely on behavior of the MIPS 		*/
-/* assembler.  Hence we treat and name this file as though it required	*/
-/* no preprocessing.							*/
-
-# define call_push(x)     move    $4,x;    jal     GC_push_one
-
-    .option pic2
-    .text
-/* Mark from machine registers that are saved by C compiler */
-#   define FRAMESZ 32
-#   define RAOFF FRAMESZ-SZREG
-#   define GPOFF FRAMESZ-(2*SZREG)
-    NESTED(GC_push_regs, FRAMESZ, ra)
-    .mask 0x80000000,-SZREG	# inform debugger of saved ra loc
-    move 	t0,gp
-    SETUP_GPX(t8)
-    PTR_SUBU	sp,FRAMESZ
-#   ifdef SETUP_GP64
-      SETUP_GP64(GPOFF, GC_push_regs)
-#   endif
-    SAVE_GP(GPOFF)
-    REG_S 	ra,RAOFF(sp)
-#   if (_MIPS_SIM == _ABIO32)
-    	call_push($2)
-    	call_push($3)
-#   endif
-    call_push($16)
-    call_push($17)
-    call_push($18)
-    call_push($19)
-    call_push($20)
-    call_push($21)
-    call_push($22)
-    call_push($23)
-    call_push($30)
-    REG_L	ra,RAOFF(sp)
-#   ifdef RESTORE_GP64
-      RESTORE_GP64
-#   endif
-    PTR_ADDU	sp,FRAMESZ
-    j		ra
-    .end    GC_push_regs
diff --git a/boehm-gc/mips_ultrix_mach_dep.s b/boehm-gc/mips_ultrix_mach_dep.s
deleted file mode 100644
index 178224e31c8..00000000000
--- a/boehm-gc/mips_ultrix_mach_dep.s
+++ /dev/null
@@ -1,26 +0,0 @@
-# define call_push(x)     move    $4,x;    jal     GC_push_one
-
-    .text
- # Mark from machine registers that are saved by C compiler
-    .globl  GC_push_regs
-    .ent    GC_push_regs
-GC_push_regs:
-    subu    $sp,8       ## Need to save only return address
-    sw      $31,4($sp)
-    .mask   0x80000000,-4
-    .frame  $sp,8,$31
-    call_push($2)
-    call_push($3)
-    call_push($16)
-    call_push($17)
-    call_push($18)
-    call_push($19)
-    call_push($20)
-    call_push($21)
-    call_push($22)
-    call_push($23)
-    call_push($30)
-    lw      $31,4($sp)
-    addu    $sp,8
-    j       $31
-    .end    GC_push_regs
diff --git a/boehm-gc/misc.c b/boehm-gc/misc.c
deleted file mode 100644
index 069c7d57ad0..00000000000
--- a/boehm-gc/misc.c
+++ /dev/null
@@ -1,1185 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1999-2001 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, July 31, 1995 5:02 pm PDT */
-
-
-#include <stdio.h>
-#include <limits.h>
-#ifndef _WIN32_WCE
-#include <signal.h>
-#endif
-
-#define I_HIDE_POINTERS	/* To make GC_call_with_alloc_lock visible */
-#include "private/gc_pmark.h"
-
-#ifdef GC_SOLARIS_THREADS
-# include <sys/syscall.h>
-#endif
-#if defined(MSWIN32) || defined(MSWINCE)
-# define WIN32_LEAN_AND_MEAN
-# define NOSERVICE
-# include <windows.h>
-# include <tchar.h>
-#endif
-
-# ifdef THREADS
-#   ifdef PCR
-#     include "il/PCR_IL.h"
-      PCR_Th_ML GC_allocate_ml;
-#   else
-#     ifdef SRC_M3
-	/* Critical section counter is defined in the M3 runtime 	*/
-	/* That's all we use.						*/
-#     else
-#	ifdef GC_SOLARIS_THREADS
-	  mutex_t GC_allocate_ml;	/* Implicitly initialized.	*/
-#	else
-#          if defined(GC_WIN32_THREADS) 
-#             if defined(GC_PTHREADS)
-		  pthread_mutex_t GC_allocate_ml = PTHREAD_MUTEX_INITIALIZER;
-#	      elif defined(GC_DLL)
-		 __declspec(dllexport) CRITICAL_SECTION GC_allocate_ml;
-#	      else
-		 CRITICAL_SECTION GC_allocate_ml;
-#	      endif
-#          else
-#             if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS)
-#		if defined(USE_SPIN_LOCK)
-	          pthread_t GC_lock_holder = NO_THREAD;
-#	        else
-		  pthread_mutex_t GC_allocate_ml = PTHREAD_MUTEX_INITIALIZER;
-	          pthread_t GC_lock_holder = NO_THREAD;
-			/* Used only for assertions, and to prevent	 */
-			/* recursive reentry in the system call wrapper. */
-#		endif 
-#    	      else
-	          --> declare allocator lock here
-#	      endif
-#	   endif
-#	endif
-#     endif
-#   endif
-# endif
-
-#if defined(NOSYS) || defined(ECOS)
-#undef STACKBASE
-#endif
-
-/* Dont unnecessarily call GC_register_main_static_data() in case 	*/
-/* dyn_load.c isn't linked in.						*/
-#ifdef DYNAMIC_LOADING
-# define GC_REGISTER_MAIN_STATIC_DATA() GC_register_main_static_data()
-#else
-# define GC_REGISTER_MAIN_STATIC_DATA() TRUE
-#endif
-
-GC_FAR struct _GC_arrays GC_arrays /* = { 0 } */;
-
-
-GC_bool GC_debugging_started = FALSE;
-	/* defined here so we don't have to load debug_malloc.o */
-
-void (*GC_check_heap) GC_PROTO((void)) = (void (*) GC_PROTO((void)))0;
-void (*GC_print_all_smashed) GC_PROTO((void)) = (void (*) GC_PROTO((void)))0;
-
-void (*GC_start_call_back) GC_PROTO((void)) = (void (*) GC_PROTO((void)))0;
-
-ptr_t GC_stackbottom = 0;
-
-#ifdef IA64
-  ptr_t GC_register_stackbottom = 0;
-#endif
-
-GC_bool GC_dont_gc = 0;
-
-GC_bool GC_dont_precollect = 0;
-
-GC_bool GC_quiet = 0;
-
-GC_bool GC_print_stats = 0;
-
-GC_bool GC_print_back_height = 0;
-
-#ifndef NO_DEBUGGING
-  GC_bool GC_dump_regularly = 0;  /* Generate regular debugging dumps. */
-#endif
-
-#ifdef KEEP_BACK_PTRS
-  long GC_backtraces = 0;	/* Number of random backtraces to 	*/
-  				/* generate for each GC.		*/
-#endif
-
-#ifdef FIND_LEAK
-  int GC_find_leak = 1;
-#else
-  int GC_find_leak = 0;
-#endif
-
-#ifdef ALL_INTERIOR_POINTERS
-  int GC_all_interior_pointers = 1;
-#else
-  int GC_all_interior_pointers = 0;
-#endif
-
-long GC_large_alloc_warn_interval = 5;
-	/* Interval between unsuppressed warnings.	*/
-
-long GC_large_alloc_warn_suppressed = 0;
-	/* Number of warnings suppressed so far.	*/
-
-/*ARGSUSED*/
-GC_PTR GC_default_oom_fn GC_PROTO((size_t bytes_requested))
-{
-    return(0);
-}
-
-GC_PTR (*GC_oom_fn) GC_PROTO((size_t bytes_requested)) = GC_default_oom_fn;
-
-extern signed_word GC_mem_found;
-
-void * GC_project2(arg1, arg2)
-void *arg1;
-void *arg2;
-{
-  return arg2;
-}
-
-# ifdef MERGE_SIZES
-    /* Set things up so that GC_size_map[i] >= words(i),		*/
-    /* but not too much bigger						*/
-    /* and so that size_map contains relatively few distinct entries 	*/
-    /* This is stolen from Russ Atkinson's Cedar quantization		*/
-    /* alogrithm (but we precompute it).				*/
-
-
-    void GC_init_size_map()
-    {
-	register unsigned i;
-
-	/* Map size 0 to something bigger.			*/
-	/* This avoids problems at lower levels.		*/
-	/* One word objects don't have to be 2 word aligned,	*/
-	/* unless we're using mark bytes.	   		*/
-	  for (i = 0; i < sizeof(word); i++) {
-	      GC_size_map[i] = MIN_WORDS;
-	  }
-#	  if MIN_WORDS > 1
-	    GC_size_map[sizeof(word)] = MIN_WORDS;
-#	  else
-	    GC_size_map[sizeof(word)] = ROUNDED_UP_WORDS(sizeof(word));
-#	  endif
-	for (i = sizeof(word) + 1; i <= 8 * sizeof(word); i++) {
-	    GC_size_map[i] = ALIGNED_WORDS(i);
-	}
-	for (i = 8*sizeof(word) + 1; i <= 16 * sizeof(word); i++) {
-	      GC_size_map[i] = (ROUNDED_UP_WORDS(i) + 1) & (~1);
-	}
-#	ifdef GC_GCJ_SUPPORT
-	   /* Make all sizes up to 32 words predictable, so that a 	*/
-	   /* compiler can statically perform the same computation,	*/
-	   /* or at least a computation that results in similar size	*/
-	   /* classes.							*/
-	   for (i = 16*sizeof(word) + 1; i <= 32 * sizeof(word); i++) {
-	      GC_size_map[i] = (ROUNDED_UP_WORDS(i) + 3) & (~3);
-	   }
-#	endif
-	/* We leave the rest of the array to be filled in on demand. */
-    }
-    
-    /* Fill in additional entries in GC_size_map, including the ith one */
-    /* We assume the ith entry is currently 0.				*/
-    /* Note that a filled in section of the array ending at n always    */
-    /* has length at least n/4.						*/
-    void GC_extend_size_map(i)
-    word i;
-    {
-        word orig_word_sz = ROUNDED_UP_WORDS(i);
-        word word_sz = orig_word_sz;
-    	register word byte_sz = WORDS_TO_BYTES(word_sz);
-    				/* The size we try to preserve.		*/
-    				/* Close to to i, unless this would	*/
-    				/* introduce too many distinct sizes.	*/
-    	word smaller_than_i = byte_sz - (byte_sz >> 3);
-    	word much_smaller_than_i = byte_sz - (byte_sz >> 2);
-    	register word low_limit;	/* The lowest indexed entry we 	*/
-    					/* initialize.			*/
-    	register word j;
-    	
-    	if (GC_size_map[smaller_than_i] == 0) {
-    	    low_limit = much_smaller_than_i;
-    	    while (GC_size_map[low_limit] != 0) low_limit++;
-    	} else {
-    	    low_limit = smaller_than_i + 1;
-    	    while (GC_size_map[low_limit] != 0) low_limit++;
-    	    word_sz = ROUNDED_UP_WORDS(low_limit);
-    	    word_sz += word_sz >> 3;
-    	    if (word_sz < orig_word_sz) word_sz = orig_word_sz;
-    	}
-#	ifdef ALIGN_DOUBLE
-	    word_sz += 1;
-	    word_sz &= ~1;
-#	endif
-	if (word_sz > MAXOBJSZ) {
-	    word_sz = MAXOBJSZ;
-	}
-	/* If we can fit the same number of larger objects in a block,	*/
-	/* do so.							*/ 
-	{
-	    size_t number_of_objs = BODY_SZ/word_sz;
-	    word_sz = BODY_SZ/number_of_objs;
-#	    ifdef ALIGN_DOUBLE
-		word_sz &= ~1;
-#	    endif
-	}
-    	byte_sz = WORDS_TO_BYTES(word_sz);
-	if (GC_all_interior_pointers) {
-	    /* We need one extra byte; don't fill in GC_size_map[byte_sz] */
-	    byte_sz -= EXTRA_BYTES;
-	}
-
-    	for (j = low_limit; j <= byte_sz; j++) GC_size_map[j] = word_sz;  
-    }
-# endif
-
-
-/*
- * The following is a gross hack to deal with a problem that can occur
- * on machines that are sloppy about stack frame sizes, notably SPARC.
- * Bogus pointers may be written to the stack and not cleared for
- * a LONG time, because they always fall into holes in stack frames
- * that are not written.  We partially address this by clearing
- * sections of the stack whenever we get control.
- */
-word GC_stack_last_cleared = 0;	/* GC_no when we last did this */
-# ifdef THREADS
-#   define BIG_CLEAR_SIZE 2048	/* Clear this much now and then.	*/
-#   define SMALL_CLEAR_SIZE 256 /* Clear this much every time.		*/
-# endif
-# define CLEAR_SIZE 213  /* Granularity for GC_clear_stack_inner */
-# define DEGRADE_RATE 50
-
-word GC_min_sp;		/* Coolest stack pointer value from which we've */
-			/* already cleared the stack.			*/
-			
-word GC_high_water;
-			/* "hottest" stack pointer value we have seen	*/
-			/* recently.  Degrades over time.		*/
-
-word GC_words_allocd_at_reset;
-
-#if defined(ASM_CLEAR_CODE)
-  extern ptr_t GC_clear_stack_inner();
-#else  
-/* Clear the stack up to about limit.  Return arg. */
-/*ARGSUSED*/
-ptr_t GC_clear_stack_inner(arg, limit)
-ptr_t arg;
-word limit;
-{
-    word dummy[CLEAR_SIZE];
-    
-    BZERO(dummy, CLEAR_SIZE*sizeof(word));
-    if ((word)(dummy) COOLER_THAN limit) {
-        (void) GC_clear_stack_inner(arg, limit);
-    }
-    /* Make sure the recursive call is not a tail call, and the bzero	*/
-    /* call is not recognized as dead code.				*/
-    GC_noop1((word)dummy);
-    return(arg);
-}
-#endif
-
-/* Clear some of the inaccessible part of the stack.  Returns its	*/
-/* argument, so it can be used in a tail call position, hence clearing  */
-/* another frame.							*/
-ptr_t GC_clear_stack(arg)
-ptr_t arg;
-{
-    register word sp = (word)GC_approx_sp();  /* Hotter than actual sp */
-#   ifdef THREADS
-        word dummy[SMALL_CLEAR_SIZE];
-	static unsigned random_no = 0;
-       			 	 /* Should be more random than it is ... */
-				 /* Used to occasionally clear a bigger	 */
-				 /* chunk.				 */
-#   endif
-    register word limit;
-    
-#   define SLOP 400
-	/* Extra bytes we clear every time.  This clears our own	*/
-	/* activation record, and should cause more frequent		*/
-	/* clearing near the cold end of the stack, a good thing.	*/
-#   define GC_SLOP 4000
-	/* We make GC_high_water this much hotter than we really saw   	*/
-	/* saw it, to cover for GC noise etc. above our current frame.	*/
-#   define CLEAR_THRESHOLD 100000
-	/* We restart the clearing process after this many bytes of	*/
-	/* allocation.  Otherwise very heavily recursive programs	*/
-	/* with sparse stacks may result in heaps that grow almost	*/
-	/* without bounds.  As the heap gets larger, collection 	*/
-	/* frequency decreases, thus clearing frequency would decrease, */
-	/* thus more junk remains accessible, thus the heap gets	*/
-	/* larger ...							*/
-# ifdef THREADS
-    if (++random_no % 13 == 0) {
-	limit = sp;
-	MAKE_HOTTER(limit, BIG_CLEAR_SIZE*sizeof(word));
-        limit &= ~0xf;	/* Make it sufficiently aligned for assembly	*/
-        		/* implementations of GC_clear_stack_inner.	*/
-	return GC_clear_stack_inner(arg, limit);
-    } else {
-	BZERO(dummy, SMALL_CLEAR_SIZE*sizeof(word));
-	return arg;
-    }
-# else
-    if (GC_gc_no > GC_stack_last_cleared) {
-        /* Start things over, so we clear the entire stack again */
-        if (GC_stack_last_cleared == 0) GC_high_water = (word) GC_stackbottom;
-        GC_min_sp = GC_high_water;
-        GC_stack_last_cleared = GC_gc_no;
-        GC_words_allocd_at_reset = GC_words_allocd;
-    }
-    /* Adjust GC_high_water */
-        MAKE_COOLER(GC_high_water, WORDS_TO_BYTES(DEGRADE_RATE) + GC_SLOP);
-        if (sp HOTTER_THAN GC_high_water) {
-            GC_high_water = sp;
-        }
-        MAKE_HOTTER(GC_high_water, GC_SLOP);
-    limit = GC_min_sp;
-    MAKE_HOTTER(limit, SLOP);
-    if (sp COOLER_THAN limit) {
-        limit &= ~0xf;	/* Make it sufficiently aligned for assembly	*/
-        		/* implementations of GC_clear_stack_inner.	*/
-        GC_min_sp = sp;
-        return(GC_clear_stack_inner(arg, limit));
-    } else if (WORDS_TO_BYTES(GC_words_allocd - GC_words_allocd_at_reset)
-    	       > CLEAR_THRESHOLD) {
-    	/* Restart clearing process, but limit how much clearing we do. */
-    	GC_min_sp = sp;
-    	MAKE_HOTTER(GC_min_sp, CLEAR_THRESHOLD/4);
-    	if (GC_min_sp HOTTER_THAN GC_high_water) GC_min_sp = GC_high_water;
-    	GC_words_allocd_at_reset = GC_words_allocd;
-    }  
-    return(arg);
-# endif
-}
-
-
-/* Return a pointer to the base address of p, given a pointer to a	*/
-/* an address within an object.  Return 0 o.w.				*/
-# ifdef __STDC__
-    GC_PTR GC_base(GC_PTR p)
-# else
-    GC_PTR GC_base(p)
-    GC_PTR p;
-# endif
-{
-    register word r;
-    register struct hblk *h;
-    register bottom_index *bi;
-    register hdr *candidate_hdr;
-    register word limit;
-    
-    r = (word)p;
-    if (!GC_is_initialized) return 0;
-    h = HBLKPTR(r);
-    GET_BI(r, bi);
-    candidate_hdr = HDR_FROM_BI(bi, r);
-    if (candidate_hdr == 0) return(0);
-    /* If it's a pointer to the middle of a large object, move it	*/
-    /* to the beginning.						*/
-	while (IS_FORWARDING_ADDR_OR_NIL(candidate_hdr)) {
-	   h = FORWARDED_ADDR(h,candidate_hdr);
-	   r = (word)h;
-	   candidate_hdr = HDR(h);
-	}
-    if (candidate_hdr -> hb_map == GC_invalid_map) return(0);
-    /* Make sure r points to the beginning of the object */
-	r &= ~(WORDS_TO_BYTES(1) - 1);
-        {
-	    register int offset = HBLKDISPL(r);
-	    register signed_word sz = candidate_hdr -> hb_sz;
-	    register signed_word map_entry;
-	      
-	    map_entry = MAP_ENTRY((candidate_hdr -> hb_map), offset);
-	    if (map_entry > CPP_MAX_OFFSET) {
-            	map_entry = (signed_word)(BYTES_TO_WORDS(offset)) % sz;
-            }
-            r -= WORDS_TO_BYTES(map_entry);
-            limit = r + WORDS_TO_BYTES(sz);
-	    if (limit > (word)(h + 1)
-	        && sz <= BYTES_TO_WORDS(HBLKSIZE)) {
-	        return(0);
-	    }
-	    if ((word)p >= limit) return(0);
-	}
-    return((GC_PTR)r);
-}
-
-
-/* Return the size of an object, given a pointer to its base.		*/
-/* (For small obects this also happens to work from interior pointers,	*/
-/* but that shouldn't be relied upon.)					*/
-# ifdef __STDC__
-    size_t GC_size(GC_PTR p)
-# else
-    size_t GC_size(p)
-    GC_PTR p;
-# endif
-{
-    register int sz;
-    register hdr * hhdr = HDR(p);
-    
-    sz = WORDS_TO_BYTES(hhdr -> hb_sz);
-    return(sz);
-}
-
-size_t GC_get_heap_size GC_PROTO(())
-{
-    return ((size_t) GC_heapsize);
-}
-
-size_t GC_get_free_bytes GC_PROTO(())
-{
-    return ((size_t) GC_large_free_bytes);
-}
-
-size_t GC_get_bytes_since_gc GC_PROTO(())
-{
-    return ((size_t) WORDS_TO_BYTES(GC_words_allocd));
-}
-
-size_t GC_get_total_bytes GC_PROTO(())
-{
-    return ((size_t) WORDS_TO_BYTES(GC_words_allocd+GC_words_allocd_before_gc));
-}
-
-GC_bool GC_is_initialized = FALSE;
-
-void GC_init()
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-
-#if defined(GC_WIN32_THREADS) && !defined(GC_PTHREADS)
-    if (!GC_is_initialized) {
-      BOOL (WINAPI *pfn) (LPCRITICAL_SECTION, DWORD) = NULL;
-      HMODULE hK32 = GetModuleHandle("kernel32.dll");
-      if (hK32)
-	  pfn = (BOOL (WINAPI *) (LPCRITICAL_SECTION, DWORD))
-		GetProcAddress (hK32,
-				"InitializeCriticalSectionAndSpinCount");
-      if (pfn)
-          pfn(&GC_allocate_ml, 4000);
-      else
-	  InitializeCriticalSection (&GC_allocate_ml);
-    }
-#endif /* MSWIN32 */
-
-    LOCK();
-    GC_init_inner();
-    UNLOCK();
-    ENABLE_SIGNALS();
-
-#   if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-	/* Make sure marker threads and started and thread local */
-	/* allocation is initialized, in case we didn't get 	 */
-	/* called from GC_init_parallel();			 */
-        {
-	  extern void GC_init_parallel(void);
-	  GC_init_parallel();
-	}
-#   endif /* PARALLEL_MARK || THREAD_LOCAL_ALLOC */
-
-#   if defined(DYNAMIC_LOADING) && defined(DARWIN)
-    {
-        /* This must be called WITHOUT the allocation lock held
-        and before any threads are created */
-        extern void GC_init_dyld();
-        GC_init_dyld();
-    }
-#   endif
-}
-
-#if defined(MSWIN32) || defined(MSWINCE)
-    CRITICAL_SECTION GC_write_cs;
-#endif
-
-#ifdef MSWIN32
-    extern void GC_init_win32 GC_PROTO((void));
-#endif
-
-extern void GC_setpagesize();
-
-
-#ifdef MSWIN32
-extern GC_bool GC_no_win32_dlls;
-#else
-# define GC_no_win32_dlls FALSE
-#endif
-
-void GC_exit_check GC_PROTO((void))
-{
-   GC_gcollect();
-}
-
-#ifdef SEARCH_FOR_DATA_START
-  extern void GC_init_linux_data_start GC_PROTO((void));
-#endif
-
-#ifdef UNIX_LIKE
-
-extern void GC_set_and_save_fault_handler GC_PROTO((void (*handler)(int)));
-
-static void looping_handler(sig)
-int sig;
-{
-    GC_err_printf1("Caught signal %d: looping in handler\n", sig);
-    for(;;);
-}
-
-static GC_bool installed_looping_handler = FALSE;
-
-static void maybe_install_looping_handler()
-{
-    /* Install looping handler before the write fault handler, so we	*/
-    /* handle write faults correctly.					*/
-      if (!installed_looping_handler && 0 != GETENV("GC_LOOP_ON_ABORT")) {
-        GC_set_and_save_fault_handler(looping_handler);
-        installed_looping_handler = TRUE;
-      }
-}
-
-#else /* !UNIX_LIKE */
-
-# define maybe_install_looping_handler()
-
-#endif
-
-void GC_init_inner()
-{
-#   if !defined(THREADS) && defined(GC_ASSERTIONS)
-        word dummy;
-#   endif
-    word initial_heap_sz = (word)MINHINCR;
-    
-    if (GC_is_initialized) return;
-#   ifdef PRINTSTATS
-      GC_print_stats = 1;
-#   endif
-#   if defined(MSWIN32) || defined(MSWINCE)
-      InitializeCriticalSection(&GC_write_cs);
-#   endif
-    if (0 != GETENV("GC_PRINT_STATS")) {
-      GC_print_stats = 1;
-    } 
-#   ifndef NO_DEBUGGING
-      if (0 != GETENV("GC_DUMP_REGULARLY")) {
-        GC_dump_regularly = 1;
-      }
-#   endif
-#   ifdef KEEP_BACK_PTRS
-      {
-        char * backtraces_string = GETENV("GC_BACKTRACES");
-        if (0 != backtraces_string) {
-          GC_backtraces = atol(backtraces_string);
-	  if (backtraces_string[0] == '\0') GC_backtraces = 1;
-        }
-      }
-#   endif
-    if (0 != GETENV("GC_FIND_LEAK")) {
-      GC_find_leak = 1;
-#     ifdef __STDC__
-        atexit(GC_exit_check);
-#     endif
-    }
-    if (0 != GETENV("GC_ALL_INTERIOR_POINTERS")) {
-      GC_all_interior_pointers = 1;
-    }
-    if (0 != GETENV("GC_DONT_GC")) {
-      GC_dont_gc = 1;
-    }
-    if (0 != GETENV("GC_PRINT_BACK_HEIGHT")) {
-      GC_print_back_height = 1;
-    }
-    if (0 != GETENV("GC_NO_BLACKLIST_WARNING")) {
-      GC_large_alloc_warn_interval = LONG_MAX;
-    }
-    {
-      char * time_limit_string = GETENV("GC_PAUSE_TIME_TARGET");
-      if (0 != time_limit_string) {
-        long time_limit = atol(time_limit_string);
-        if (time_limit < 5) {
-	  WARN("GC_PAUSE_TIME_TARGET environment variable value too small "
-	       "or bad syntax: Ignoring\n", 0);
-        } else {
-	  GC_time_limit = time_limit;
-        }
-      }
-    }
-    {
-      char * interval_string = GETENV("GC_LARGE_ALLOC_WARN_INTERVAL");
-      if (0 != interval_string) {
-        long interval = atol(interval_string);
-        if (interval <= 0) {
-	  WARN("GC_LARGE_ALLOC_WARN_INTERVAL environment variable has "
-	       "bad value: Ignoring\n", 0);
-        } else {
-	  GC_large_alloc_warn_interval = interval;
-        }
-      }
-    }
-    maybe_install_looping_handler();
-    /* Adjust normal object descriptor for extra allocation.	*/
-    if (ALIGNMENT > GC_DS_TAGS && EXTRA_BYTES != 0) {
-      GC_obj_kinds[NORMAL].ok_descriptor = ((word)(-ALIGNMENT) | GC_DS_LENGTH);
-    }
-    GC_setpagesize();
-    GC_exclude_static_roots(beginGC_arrays, endGC_arrays);
-    GC_exclude_static_roots(beginGC_obj_kinds, endGC_obj_kinds);
-#   ifdef SEPARATE_GLOBALS
-      GC_exclude_static_roots(beginGC_objfreelist, endGC_objfreelist);
-      GC_exclude_static_roots(beginGC_aobjfreelist, endGC_aobjfreelist);
-#   endif
-#   ifdef MSWIN32
- 	GC_init_win32();
-#   endif
-#   if defined(SEARCH_FOR_DATA_START)
-	GC_init_linux_data_start();
-#   endif
-#   if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__)
-	GC_init_netbsd_elf();
-#   endif
-#   if defined(GC_PTHREADS) || defined(GC_SOLARIS_THREADS) \
-       || defined(GC_WIN32_THREADS)
-        GC_thr_init();
-#   endif
-#   ifdef GC_SOLARIS_THREADS
-	/* We need dirty bits in order to find live stack sections.	*/
-        GC_dirty_init();
-#   endif
-#   if !defined(THREADS) || defined(GC_PTHREADS) || defined(GC_WIN32_THREADS) \
-	|| defined(GC_SOLARIS_THREADS)
-      if (GC_stackbottom == 0) {
-        # if defined(GC_PTHREADS) && ! defined(GC_SOLARIS_THREADS)
-	/* Use thread_stack_base if available, as GC could be initialized from
-	   a thread that is not the "main" thread.  */
-	GC_stackbottom = GC_get_thread_stack_base();
-	# endif
-	if (GC_stackbottom == 0)
-	  GC_stackbottom = GC_get_stack_base();
-#       if (defined(LINUX) || defined(HPUX)) && defined(IA64)
-	  GC_register_stackbottom = GC_get_register_stack_base();
-#       endif
-      } else {
-#       if (defined(LINUX) || defined(HPUX)) && defined(IA64)
-	  if (GC_register_stackbottom == 0) {
-	    WARN("GC_register_stackbottom should be set with GC_stackbottom", 0);
-	    /* The following may fail, since we may rely on	 	*/
-	    /* alignment properties that may not hold with a user set	*/
-	    /* GC_stackbottom.						*/
-	    GC_register_stackbottom = GC_get_register_stack_base();
-	  }
-#	endif
-      }
-#   endif
-    GC_STATIC_ASSERT(sizeof (ptr_t) == sizeof(word));
-    GC_STATIC_ASSERT(sizeof (signed_word) == sizeof(word));
-    GC_STATIC_ASSERT(sizeof (struct hblk) == HBLKSIZE);
-#   ifndef THREADS
-#     if defined(STACK_GROWS_UP) && defined(STACK_GROWS_DOWN)
-  	ABORT(
-  	  "Only one of STACK_GROWS_UP and STACK_GROWS_DOWN should be defd\n");
-#     endif
-#     if !defined(STACK_GROWS_UP) && !defined(STACK_GROWS_DOWN)
-  	ABORT(
-  	  "One of STACK_GROWS_UP and STACK_GROWS_DOWN should be defd\n");
-#     endif
-#     ifdef STACK_GROWS_DOWN
-        GC_ASSERT((word)(&dummy) <= (word)GC_stackbottom);
-#     else
-        GC_ASSERT((word)(&dummy) >= (word)GC_stackbottom);
-#     endif
-#   endif
-#   if !defined(_AUX_SOURCE) || defined(__GNUC__)
-      GC_ASSERT((word)(-1) > (word)0);
-      /* word should be unsigned */
-#   endif
-    GC_ASSERT((signed_word)(-1) < (signed_word)0);
-    
-    /* Add initial guess of root sets.  Do this first, since sbrk(0)	*/
-    /* might be used.							*/
-      if (GC_REGISTER_MAIN_STATIC_DATA()) GC_register_data_segments();
-    GC_init_headers();
-    GC_bl_init();
-    GC_mark_init();
-    {
-	char * sz_str = GETENV("GC_INITIAL_HEAP_SIZE");
-	if (sz_str != NULL) {
-	  initial_heap_sz = atoi(sz_str);
-	  if (initial_heap_sz <= MINHINCR * HBLKSIZE) {
-	    WARN("Bad initial heap size %s - ignoring it.\n",
-		 sz_str);
-	  } 
-	  initial_heap_sz = divHBLKSZ(initial_heap_sz);
-	}
-    }
-    {
-	char * sz_str = GETENV("GC_MAXIMUM_HEAP_SIZE");
-	if (sz_str != NULL) {
-	  word max_heap_sz = (word)atol(sz_str);
-	  if (max_heap_sz < initial_heap_sz * HBLKSIZE) {
-	    WARN("Bad maximum heap size %s - ignoring it.\n",
-		 sz_str);
-	  } 
-	  if (0 == GC_max_retries) GC_max_retries = 2;
-	  GC_set_max_heap_size(max_heap_sz);
-	}
-    }
-    if (!GC_expand_hp_inner(initial_heap_sz)) {
-        GC_err_printf0("Can't start up: not enough memory\n");
-        EXIT();
-    }
-    /* Preallocate large object map.  It's otherwise inconvenient to 	*/
-    /* deal with failure.						*/
-      if (!GC_add_map_entry((word)0)) {
-        GC_err_printf0("Can't start up: not enough memory\n");
-        EXIT();
-      }
-    GC_register_displacement_inner(0L);
-#   ifdef MERGE_SIZES
-      GC_init_size_map();
-#   endif
-#   ifdef PCR
-      if (PCR_IL_Lock(PCR_Bool_false, PCR_allSigsBlocked, PCR_waitForever)
-          != PCR_ERes_okay) {
-          ABORT("Can't lock load state\n");
-      } else if (PCR_IL_Unlock() != PCR_ERes_okay) {
-          ABORT("Can't unlock load state\n");
-      }
-      PCR_IL_Unlock();
-      GC_pcr_install();
-#   endif
-#   if !defined(SMALL_CONFIG)
-      if (!GC_no_win32_dlls && 0 != GETENV("GC_ENABLE_INCREMENTAL")) {
-	GC_ASSERT(!GC_incremental);
-        GC_setpagesize();
-#       ifndef GC_SOLARIS_THREADS
-          GC_dirty_init();
-#       endif
-        GC_ASSERT(GC_words_allocd == 0)
-    	GC_incremental = TRUE;
-      }
-#   endif /* !SMALL_CONFIG */
-    COND_DUMP;
-    /* Get black list set up and/or incremental GC started */
-      if (!GC_dont_precollect || GC_incremental) GC_gcollect_inner();
-    GC_is_initialized = TRUE;
-#   ifdef STUBBORN_ALLOC
-    	GC_stubborn_init();
-#   endif
-    /* Convince lint that some things are used */
-#   ifdef LINT
-      {
-          extern char * GC_copyright[];
-          extern int GC_read();
-          extern void GC_register_finalizer_no_order();
-          
-          GC_noop(GC_copyright, GC_find_header,
-                  GC_push_one, GC_call_with_alloc_lock, GC_read,
-                  GC_dont_expand,
-#		  ifndef NO_DEBUGGING
-		    GC_dump,
-#		  endif
-                  GC_register_finalizer_no_order);
-      }
-#   endif
-}
-
-void GC_enable_incremental GC_PROTO(())
-{
-# if !defined(SMALL_CONFIG) && !defined(KEEP_BACK_PTRS)
-  /* If we are keeping back pointers, the GC itself dirties all	*/
-  /* pages on which objects have been marked, making 		*/
-  /* incremental GC pointless.					*/
-  if (!GC_find_leak) {
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    if (GC_incremental) goto out;
-    GC_setpagesize();
-    if (GC_no_win32_dlls) goto out;
-#   ifndef GC_SOLARIS_THREADS 
-      maybe_install_looping_handler();  /* Before write fault handler! */
-      GC_dirty_init();
-#   endif
-    if (!GC_is_initialized) {
-        GC_init_inner();
-    }
-    if (GC_incremental) goto out;
-    if (GC_dont_gc) {
-        /* Can't easily do it. */
-        UNLOCK();
-    	ENABLE_SIGNALS();
-    	return;
-    }
-    if (GC_words_allocd > 0) {
-    	/* There may be unmarked reachable objects	*/
-    	GC_gcollect_inner();
-    }   /* else we're OK in assuming everything's	*/
-    	/* clean since nothing can point to an	  	*/
-    	/* unmarked object.			  	*/
-    GC_read_dirty();
-    GC_incremental = TRUE;
-out:
-    UNLOCK();
-    ENABLE_SIGNALS();
-  }
-# endif
-}
-
-
-#if defined(MSWIN32) || defined(MSWINCE)
-# define LOG_FILE _T("gc.log")
-
-  HANDLE GC_stdout = 0;
-
-  void GC_deinit()
-  {
-      if (GC_is_initialized) {
-  	DeleteCriticalSection(&GC_write_cs);
-      }
-  }
-
-  int GC_write(buf, len)
-  GC_CONST char * buf;
-  size_t len;
-  {
-      BOOL tmp;
-      DWORD written;
-      if (len == 0)
-	  return 0;
-      EnterCriticalSection(&GC_write_cs);
-      if (GC_stdout == INVALID_HANDLE_VALUE) {
-	  return -1;
-      } else if (GC_stdout == 0) {
-	  GC_stdout = CreateFile(LOG_FILE, GENERIC_WRITE,
-        			 FILE_SHARE_READ | FILE_SHARE_WRITE,
-        			 NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH,
-        			 NULL); 
-    	  if (GC_stdout == INVALID_HANDLE_VALUE) ABORT("Open of log file failed");
-      }
-      tmp = WriteFile(GC_stdout, buf, len, &written, NULL);
-      if (!tmp)
-	  DebugBreak();
-      LeaveCriticalSection(&GC_write_cs);
-      return tmp ? (int)written : -1;
-  }
-
-#endif
-
-#if defined(OS2) || defined(MACOS)
-FILE * GC_stdout = NULL;
-FILE * GC_stderr = NULL;
-int GC_tmp;  /* Should really be local ... */
-
-  void GC_set_files()
-  {
-      if (GC_stdout == NULL) {
-	GC_stdout = stdout;
-    }
-    if (GC_stderr == NULL) {
-	GC_stderr = stderr;
-    }
-  }
-#endif
-
-#if !defined(OS2) && !defined(MACOS) && !defined(MSWIN32) && !defined(MSWINCE)
-  int GC_stdout = 1;
-  int GC_stderr = 2;
-# if !defined(AMIGA)
-#   include <unistd.h>
-# endif
-#endif
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(OS2) \
-    && !defined(MACOS)  && !defined(ECOS) && !defined(NOSYS)
-int GC_write(fd, buf, len)
-int fd;
-GC_CONST char *buf;
-size_t len;
-{
-     register int bytes_written = 0;
-     register int result;
-     
-     while (bytes_written < len) {
-#	ifdef GC_SOLARIS_THREADS
-	    result = syscall(SYS_write, fd, buf + bytes_written,
-	    			  	    len - bytes_written);
-#	else
-     	    result = write(fd, buf + bytes_written, len - bytes_written);
-#	endif
-	if (-1 == result) return(result);
-	bytes_written += result;
-    }
-    return(bytes_written);
-}
-#endif /* UN*X */
-
-#ifdef ECOS
-int GC_write(fd, buf, len)
-{
-  _Jv_diag_write (buf, len);
-  return len;
-}
-#endif
-
-#ifdef NOSYS
-int GC_write(fd, buf, len)
-{
-  /* No writing.  */
-  return len;
-}
-#endif
-
-
-#if defined(MSWIN32) || defined(MSWINCE)
-#   define WRITE(f, buf, len) GC_write(buf, len)
-#else
-#   if defined(OS2) || defined(MACOS)
-#   define WRITE(f, buf, len) (GC_set_files(), \
-			       GC_tmp = fwrite((buf), 1, (len), (f)), \
-			       fflush(f), GC_tmp)
-#   else
-#     define WRITE(f, buf, len) GC_write((f), (buf), (len))
-#   endif
-#endif
-
-/* A version of printf that is unlikely to call malloc, and is thus safer */
-/* to call from the collector in case malloc has been bound to GC_malloc. */
-/* Assumes that no more than 1023 characters are written at once.	  */
-/* Assumes that all arguments have been converted to something of the	  */
-/* same size as long, and that the format conversions expect something	  */
-/* of that size.							  */
-void GC_printf(format, a, b, c, d, e, f)
-GC_CONST char * format;
-long a, b, c, d, e, f;
-{
-    char buf[1025];
-    
-    if (GC_quiet) return;
-    buf[1024] = 0x15;
-    (void) sprintf(buf, format, a, b, c, d, e, f);
-    if (buf[1024] != 0x15) ABORT("GC_printf clobbered stack");
-    if (WRITE(GC_stdout, buf, strlen(buf)) < 0) ABORT("write to stdout failed");
-}
-
-void GC_err_printf(format, a, b, c, d, e, f)
-GC_CONST char * format;
-long a, b, c, d, e, f;
-{
-    char buf[1025];
-    
-    buf[1024] = 0x15;
-    (void) sprintf(buf, format, a, b, c, d, e, f);
-    if (buf[1024] != 0x15) ABORT("GC_err_printf clobbered stack");
-    if (WRITE(GC_stderr, buf, strlen(buf)) < 0) ABORT("write to stderr failed");
-}
-
-void GC_err_puts(s)
-GC_CONST char *s;
-{
-    if (WRITE(GC_stderr, s, strlen(s)) < 0) ABORT("write to stderr failed");
-}
-
-#if defined(LINUX) && !defined(SMALL_CONFIG)
-void GC_err_write(buf, len)
-GC_CONST char *buf;
-size_t len;
-{
-    if (WRITE(GC_stderr, buf, len) < 0) ABORT("write to stderr failed");
-}
-#endif
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_default_warn_proc(char *msg, GC_word arg)
-# else
-    void GC_default_warn_proc(msg, arg)
-    char *msg;
-    GC_word arg;
-# endif
-{
-    GC_err_printf1(msg, (unsigned long)arg);
-}
-
-GC_warn_proc GC_current_warn_proc = GC_default_warn_proc;
-
-# if defined(__STDC__) || defined(__cplusplus)
-    GC_warn_proc GC_set_warn_proc(GC_warn_proc p)
-# else
-    GC_warn_proc GC_set_warn_proc(p)
-    GC_warn_proc p;
-# endif
-{
-    GC_warn_proc result;
-
-#   ifdef GC_WIN32_THREADS
-      GC_ASSERT(GC_is_initialized);
-#   endif
-    LOCK();
-    result = GC_current_warn_proc;
-    GC_current_warn_proc = p;
-    UNLOCK();
-    return(result);
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    GC_word GC_set_free_space_divisor (GC_word value)
-# else
-    GC_word GC_set_free_space_divisor (value)
-    GC_word value;
-# endif
-{
-    GC_word old = GC_free_space_divisor;
-    GC_free_space_divisor = value;
-    return old;
-}
-
-#ifndef PCR
-void GC_abort(msg)
-GC_CONST char * msg;
-{
-#   if defined(MSWIN32)
-      (void) MessageBoxA(NULL, msg, "Fatal error in gc", MB_ICONERROR|MB_OK);
-#   else
-      GC_err_printf1("%s\n", msg);
-#   endif
-    if (GETENV("GC_LOOP_ON_ABORT") != NULL) {
-	    /* In many cases it's easier to debug a running process.	*/
-	    /* It's arguably nicer to sleep, but that makes it harder	*/
-	    /* to look at the thread if the debugger doesn't know much	*/
-	    /* about threads.						*/
-	    for(;;) {}
-    }
-#   if defined(MSWIN32) || defined(MSWINCE)
-	DebugBreak();
-#   else
-        (void) abort();
-#   endif
-}
-#endif
-
-void GC_enable()
-{
-    LOCK();
-    GC_dont_gc--;
-    UNLOCK();
-}
-
-void GC_disable()
-{
-    LOCK();
-    GC_dont_gc++;
-    UNLOCK();
-}
-
-/* Helper procedures for new kind creation.	*/
-void ** GC_new_free_list_inner()
-{
-    void *result = GC_INTERNAL_MALLOC((MAXOBJSZ+1)*sizeof(ptr_t), PTRFREE);
-    if (result == 0) ABORT("Failed to allocate freelist for new kind");
-    BZERO(result, (MAXOBJSZ+1)*sizeof(ptr_t));
-    return result;
-}
-
-void ** GC_new_free_list()
-{
-    void *result;
-    LOCK(); DISABLE_SIGNALS();
-    result = GC_new_free_list_inner();
-    UNLOCK(); ENABLE_SIGNALS();
-    return result;
-}
-
-int GC_new_kind_inner(fl, descr, adjust, clear)
-void **fl;
-GC_word descr;
-int adjust;
-int clear;
-{
-    int result = GC_n_kinds++;
-
-    if (GC_n_kinds > MAXOBJKINDS) ABORT("Too many kinds");
-    GC_obj_kinds[result].ok_freelist = (ptr_t *)fl;
-    GC_obj_kinds[result].ok_reclaim_list = 0;
-    GC_obj_kinds[result].ok_descriptor = descr;
-    GC_obj_kinds[result].ok_relocate_descr = adjust;
-    GC_obj_kinds[result].ok_init = clear;
-    return result;
-}
-
-int GC_new_kind(fl, descr, adjust, clear)
-void **fl;
-GC_word descr;
-int adjust;
-int clear;
-{
-    int result;
-    LOCK(); DISABLE_SIGNALS();
-    result = GC_new_kind_inner(fl, descr, adjust, clear);
-    UNLOCK(); ENABLE_SIGNALS();
-    return result;
-}
-
-int GC_new_proc_inner(proc)
-GC_mark_proc proc;
-{
-    int result = GC_n_mark_procs++;
-
-    if (GC_n_mark_procs > MAX_MARK_PROCS) ABORT("Too many mark procedures");
-    GC_mark_procs[result] = proc;
-    return result;
-}
-
-int GC_new_proc(proc)
-GC_mark_proc proc;
-{
-    int result;
-    LOCK(); DISABLE_SIGNALS();
-    result = GC_new_proc_inner(proc);
-    UNLOCK(); ENABLE_SIGNALS();
-    return result;
-}
-
-
-#if !defined(NO_DEBUGGING)
-
-void GC_dump()
-{
-    GC_printf0("***Static roots:\n");
-    GC_print_static_roots();
-    GC_printf0("\n***Heap sections:\n");
-    GC_print_heap_sects();
-    GC_printf0("\n***Free blocks:\n");
-    GC_print_hblkfreelist();
-    GC_printf0("\n***Blocks in use:\n");
-    GC_print_block_list();
-    GC_printf0("\n***Finalization statistics:\n");
-    GC_print_finalization_stats();
-}
-
-#endif /* NO_DEBUGGING */
diff --git a/boehm-gc/new_hblk.c b/boehm-gc/new_hblk.c
deleted file mode 100644
index e5580e4ca21..00000000000
--- a/boehm-gc/new_hblk.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * This file contains the functions:
- *	ptr_t GC_build_flXXX(h, old_fl)
- *	void GC_new_hblk(n)
- */
-/* Boehm, May 19, 1994 2:09 pm PDT */
-
-
-# include <stdio.h>
-# include "private/gc_priv.h"
-
-#ifndef SMALL_CONFIG
-/*
- * Build a free list for size 1 objects inside hblk h.  Set the last link to
- * be ofl.  Return a pointer tpo the first free list entry.
- */
-ptr_t GC_build_fl1(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1);
-    
-    p[0] = (word)ofl;
-    p[1] = (word)(p);
-    p[2] = (word)(p+1);
-    p[3] = (word)(p+2);
-    p += 4;
-    for (; p < lim; p += 4) {
-        p[0] = (word)(p-1);
-        p[1] = (word)(p);
-        p[2] = (word)(p+1);
-        p[3] = (word)(p+2);
-    };
-    return((ptr_t)(p-1));
-}
-
-/* The same for size 2 cleared objects */
-ptr_t GC_build_fl_clear2(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1);
-    
-    p[0] = (word)ofl;
-    p[1] = 0;
-    p[2] = (word)p;
-    p[3] = 0;
-    p += 4;
-    for (; p < lim; p += 4) {
-        p[0] = (word)(p-2);
-        p[1] = 0;
-        p[2] = (word)p;
-        p[3] = 0;
-    };
-    return((ptr_t)(p-2));
-}
-
-/* The same for size 3 cleared objects */
-ptr_t GC_build_fl_clear3(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1) - 2;
-    
-    p[0] = (word)ofl;
-    p[1] = 0;
-    p[2] = 0;
-    p += 3;
-    for (; p < lim; p += 3) {
-        p[0] = (word)(p-3);
-        p[1] = 0;
-        p[2] = 0;
-    };
-    return((ptr_t)(p-3));
-}
-
-/* The same for size 4 cleared objects */
-ptr_t GC_build_fl_clear4(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1);
-    
-    p[0] = (word)ofl;
-    p[1] = 0;
-    p[2] = 0;
-    p[3] = 0;
-    p += 4;
-    for (; p < lim; p += 4) {
-	PREFETCH_FOR_WRITE((ptr_t)(p+64));
-        p[0] = (word)(p-4);
-        p[1] = 0;
-	CLEAR_DOUBLE(p+2);
-    };
-    return((ptr_t)(p-4));
-}
-
-/* The same for size 2 uncleared objects */
-ptr_t GC_build_fl2(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1);
-    
-    p[0] = (word)ofl;
-    p[2] = (word)p;
-    p += 4;
-    for (; p < lim; p += 4) {
-        p[0] = (word)(p-2);
-        p[2] = (word)p;
-    };
-    return((ptr_t)(p-2));
-}
-
-/* The same for size 4 uncleared objects */
-ptr_t GC_build_fl4(h, ofl)
-struct hblk *h;
-ptr_t ofl;
-{
-    register word * p = h -> hb_body;
-    register word * lim = (word *)(h + 1);
-    
-    p[0] = (word)ofl;
-    p[4] = (word)p;
-    p += 8;
-    for (; p < lim; p += 8) {
-	PREFETCH_FOR_WRITE((ptr_t)(p+64));
-        p[0] = (word)(p-4);
-        p[4] = (word)p;
-    };
-    return((ptr_t)(p-4));
-}
-
-#endif /* !SMALL_CONFIG */
-
-
-/* Build a free list for objects of size sz inside heap block h.	*/
-/* Clear objects inside h if clear is set.  Add list to the end of	*/
-/* the free list we build.  Return the new free list.			*/
-/* This could be called without the main GC lock, if we ensure that	*/
-/* there is no concurrent collection which might reclaim objects that	*/
-/* we have not yet allocated.						*/
-ptr_t GC_build_fl(h, sz, clear, list)
-struct hblk *h;
-word sz;
-GC_bool clear;
-ptr_t list;
-{
-  word *p, *prev;
-  word *last_object;		/* points to last object in new hblk	*/
-
-  /* Do a few prefetches here, just because its cheap.  	*/
-  /* If we were more serious about it, these should go inside	*/
-  /* the loops.  But write prefetches usually don't seem to	*/
-  /* matter much.						*/
-    PREFETCH_FOR_WRITE((ptr_t)h);
-    PREFETCH_FOR_WRITE((ptr_t)h + 128);
-    PREFETCH_FOR_WRITE((ptr_t)h + 256);
-    PREFETCH_FOR_WRITE((ptr_t)h + 378);
-  /* Handle small objects sizes more efficiently.  For larger objects 	*/
-  /* the difference is less significant.				*/
-#  ifndef SMALL_CONFIG
-    switch (sz) {
-        case 1: return GC_build_fl1(h, list);
-        case 2: if (clear) {
-        	    return GC_build_fl_clear2(h, list);
-        	} else {
-        	    return GC_build_fl2(h, list);
-        	}
-        case 3: if (clear) {
-         	    return GC_build_fl_clear3(h, list);
-        	} else {
-        	    /* It's messy to do better than the default here. */
-        	    break;
-        	}
-        case 4: if (clear) {
-        	    return GC_build_fl_clear4(h, list);
-        	} else {
-        	    return GC_build_fl4(h, list);
-        	}
-        default:
-        	break;
-    }
-#  endif /* !SMALL_CONFIG */
-    
-  /* Clear the page if necessary. */
-    if (clear) BZERO(h, HBLKSIZE);
-    
-  /* Add objects to free list */
-    p = &(h -> hb_body[sz]);	/* second object in *h	*/
-    prev = &(h -> hb_body[0]);       	/* One object behind p	*/
-    last_object = (word *)((char *)h + HBLKSIZE);
-    last_object -= sz;
-			    /* Last place for last object to start */
-
-  /* make a list of all objects in *h with head as last object */
-    while (p <= last_object) {
-      /* current object's link points to last object */
-        obj_link(p) = (ptr_t)prev;
-	prev = p;
-	p += sz;
-    }
-    p -= sz;			/* p now points to last object */
-
-  /*
-   * put p (which is now head of list of objects in *h) as first
-   * pointer in the appropriate free list for this size.
-   */
-      obj_link(h -> hb_body) = list;
-      return ((ptr_t)p);
-}
-
-/*
- * Allocate a new heapblock for small objects of size n.
- * Add all of the heapblock's objects to the free list for objects
- * of that size.
- * Set all mark bits if objects are uncollectable.
- * Will fail to do anything if we are out of memory.
- */
-void GC_new_hblk(sz, kind)
-register word sz;
-int kind;
-{
-    register struct hblk *h;	/* the new heap block			*/
-    register GC_bool clear = GC_obj_kinds[kind].ok_init;
-
-#   ifdef PRINTSTATS
-	if ((sizeof (struct hblk)) > HBLKSIZE) {
-	    ABORT("HBLK SZ inconsistency");
-        }
-#   endif
-  if (GC_debugging_started) clear = TRUE;
-
-  /* Allocate a new heap block */
-    h = GC_allochblk(sz, kind, 0);
-    if (h == 0) return;
-
-  /* Mark all objects if appropriate. */
-      if (IS_UNCOLLECTABLE(kind)) GC_set_hdr_marks(HDR(h));
-
-  /* Build the free list */
-      GC_obj_kinds[kind].ok_freelist[sz] =
-	GC_build_fl(h, sz, clear, GC_obj_kinds[kind].ok_freelist[sz]);
-}
-
diff --git a/boehm-gc/obj_map.c b/boehm-gc/obj_map.c
deleted file mode 100644
index d002d65b4dd..00000000000
--- a/boehm-gc/obj_map.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991, 1992 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1999-2001 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-  
-/* Routines for maintaining maps describing heap block
- * layouts for various object sizes.  Allows fast pointer validity checks
- * and fast location of object start locations on machines (such as SPARC)
- * with slow division.
- */
- 
-# include "private/gc_priv.h"
-
-map_entry_type * GC_invalid_map = 0;
-
-/* Invalidate the object map associated with a block.	Free blocks	*/
-/* are identified by invalid maps.					*/
-void GC_invalidate_map(hhdr)
-hdr *hhdr;
-{
-    register int displ;
-    
-    if (GC_invalid_map == 0) {
-        GC_invalid_map = (map_entry_type *)GC_scratch_alloc(MAP_SIZE);
-        if (GC_invalid_map == 0) {
-            GC_err_printf0(
-            	"Cant initialize GC_invalid_map: insufficient memory\n");
-            EXIT();
-        }
-        for (displ = 0; displ < HBLKSIZE; displ++) {
-            MAP_ENTRY(GC_invalid_map, displ) = OBJ_INVALID;
-        }
-    }
-    hhdr -> hb_map = GC_invalid_map;
-}
-
-/* Consider pointers that are offset bytes displaced from the beginning */
-/* of an object to be valid.                                            */
-
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_register_displacement(GC_word offset)
-# else
-    void GC_register_displacement(offset) 
-    GC_word offset;
-# endif
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    GC_register_displacement_inner(offset);
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-void GC_register_displacement_inner(offset) 
-word offset;
-{
-    register unsigned i;
-    word map_entry = BYTES_TO_WORDS(offset);
-    
-    if (offset >= VALID_OFFSET_SZ) {
-        ABORT("Bad argument to GC_register_displacement");
-    }
-    if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
-    if (!GC_valid_offsets[offset]) {
-      GC_valid_offsets[offset] = TRUE;
-      GC_modws_valid_offsets[offset % sizeof(word)] = TRUE;
-      if (!GC_all_interior_pointers) {
-        for (i = 0; i <= MAXOBJSZ; i++) {
-          if (GC_obj_map[i] != 0) {
-             if (i == 0) {
-               GC_obj_map[i][offset] = (map_entry_type)map_entry;
-             } else {
-               register unsigned j;
-               register unsigned lb = WORDS_TO_BYTES(i);
-               
-               if (offset < lb) {
-                 for (j = offset; j < HBLKSIZE; j += lb) {
-                   GC_obj_map[i][j] = (map_entry_type)map_entry;
-                 }
-               }
-             }
-          }
-	}
-      }
-    }
-}
-
-
-/* Add a heap block map for objects of size sz to obj_map.	*/
-/* Return FALSE on failure.					*/
-GC_bool GC_add_map_entry(sz)
-word sz;
-{
-    register unsigned obj_start;
-    register unsigned displ;
-    register map_entry_type * new_map;
-    word map_entry;
-    
-    if (sz > MAXOBJSZ) sz = 0;
-    if (GC_obj_map[sz] != 0) {
-        return(TRUE);
-    }
-    new_map = (map_entry_type *)GC_scratch_alloc(MAP_SIZE);
-    if (new_map == 0) return(FALSE);
-#   ifdef PRINTSTATS
-        GC_printf1("Adding block map for size %lu\n", (unsigned long)sz);
-#   endif
-    for (displ = 0; displ < HBLKSIZE; displ++) {
-        MAP_ENTRY(new_map,displ) = OBJ_INVALID;
-    }
-    if (sz == 0) {
-        for(displ = 0; displ <= HBLKSIZE; displ++) {
-            if (OFFSET_VALID(displ)) {
-		map_entry = BYTES_TO_WORDS(displ);
-		if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
-                MAP_ENTRY(new_map,displ) = (map_entry_type)map_entry;
-            }
-        }
-    } else {
-        for (obj_start = 0;
-             obj_start + WORDS_TO_BYTES(sz) <= HBLKSIZE;
-             obj_start += WORDS_TO_BYTES(sz)) {
-             for (displ = 0; displ < WORDS_TO_BYTES(sz); displ++) {
-                 if (OFFSET_VALID(displ)) {
-		     map_entry = BYTES_TO_WORDS(displ);
-		     if (map_entry > MAX_OFFSET) map_entry = OFFSET_TOO_BIG;
-                     MAP_ENTRY(new_map, obj_start + displ) =
-						(map_entry_type)map_entry;
-                 }
-             }
-        }
-    }
-    GC_obj_map[sz] = new_map;
-    return(TRUE);
-}
diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c
deleted file mode 100644
index 60cbc2b2976..00000000000
--- a/boehm-gc/os_dep.c
+++ /dev/null
@@ -1,4344 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-# include "private/gc_priv.h"
-
-# if defined(LINUX) && !defined(POWERPC)
-#   include <linux/version.h>
-#   if (LINUX_VERSION_CODE <= 0x10400)
-      /* Ugly hack to get struct sigcontext_struct definition.  Required      */
-      /* for some early 1.3.X releases.  Will hopefully go away soon. */
-      /* in some later Linux releases, asm/sigcontext.h may have to   */
-      /* be included instead.                                         */
-#     define __KERNEL__
-#     include <asm/signal.h>
-#     undef __KERNEL__
-#   else
-      /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
-      /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
-      /* prototypes, so we have to include the top-level sigcontext.h to    */
-      /* make sure the former gets defined to be the latter if appropriate. */
-#     include <features.h>
-#     if 2 <= __GLIBC__
-#       if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
-	  /* glibc 2.1 no longer has sigcontext.h.  But signal.h	*/
-	  /* has the right declaration for glibc 2.1.			*/
-#         include <sigcontext.h>
-#       endif /* 0 == __GLIBC_MINOR__ */
-#     else /* not 2 <= __GLIBC__ */
-        /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
-        /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
-#       include <asm/sigcontext.h>
-#     endif /* 2 <= __GLIBC__ */
-#   endif
-# endif
-# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \
-    && !defined(MSWINCE)
-#   include <sys/types.h>
-#   if !defined(MSWIN32) && !defined(SUNOS4)
-#   	include <unistd.h>
-#   endif
-# endif
-
-# include <stdio.h>
-# if defined(MSWINCE)
-#   define SIGSEGV 0 /* value is irrelevant */
-# else
-#   include <signal.h>
-# endif
-
-#if defined(LINUX) || defined(LINUX_STACKBOTTOM)
-# include <ctype.h>
-#endif
-
-/* Blatantly OS dependent routines, except for those that are related 	*/
-/* to dynamic loading.							*/
-
-# if defined(HEURISTIC2) || defined(SEARCH_FOR_DATA_START)
-#   define NEED_FIND_LIMIT
-# endif
-
-# if !defined(STACKBOTTOM) && defined(HEURISTIC2)
-#   define NEED_FIND_LIMIT
-# endif
-
-# if (defined(SUNOS4) && defined(DYNAMIC_LOADING)) && !defined(PCR)
-#   define NEED_FIND_LIMIT
-# endif
-
-# if (defined(SVR4) || defined(AUX) || defined(DGUX) \
-      || (defined(LINUX) && defined(SPARC))) && !defined(PCR)
-#   define NEED_FIND_LIMIT
-# endif
-
-#if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__))
-#  include <machine/trap.h>
-#  if !defined(PCR)
-#    define NEED_FIND_LIMIT
-#  endif
-#endif
-
-#if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__) \
-    && !defined(NEED_FIND_LIMIT)
-   /* Used by GC_init_netbsd_elf() below.	*/
-#  define NEED_FIND_LIMIT
-#endif
-
-#ifdef NEED_FIND_LIMIT
-#   include <setjmp.h>
-#endif
-
-#ifdef AMIGA
-# define GC_AMIGA_DEF
-# include "AmigaOS.c"
-# undef GC_AMIGA_DEF
-#endif
-
-#if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-# define WIN32_LEAN_AND_MEAN
-# define NOSERVICE
-# include <windows.h>
-#endif
-
-#ifdef MACOS
-# include <Processes.h>
-#endif
-
-#ifdef IRIX5
-# include <sys/uio.h>
-# include <malloc.h>   /* for locking */
-#endif
-#if defined(USE_MMAP) || defined(USE_MUNMAP)
-# ifndef USE_MMAP
-    --> USE_MUNMAP requires USE_MMAP
-# endif
-# include <sys/types.h>
-# include <sys/mman.h>
-# include <sys/stat.h>
-# include <errno.h>
-#endif
-
-#ifdef UNIX_LIKE
-# include <fcntl.h>
-# if defined(SUNOS5SIGS) && !defined(FREEBSD)
-#  include <sys/siginfo.h>
-# endif
-  /* Define SETJMP and friends to be the version that restores	*/
-  /* the signal mask.						*/
-# define SETJMP(env) sigsetjmp(env, 1)
-# define LONGJMP(env, val) siglongjmp(env, val)
-# define JMP_BUF sigjmp_buf
-#else
-# define SETJMP(env) setjmp(env)
-# define LONGJMP(env, val) longjmp(env, val)
-# define JMP_BUF jmp_buf
-#endif
-
-#ifdef DARWIN
-/* for get_etext and friends */
-#include <mach-o/getsect.h>
-#endif
-
-#ifdef DJGPP
-  /* Apparently necessary for djgpp 2.01.  May cause problems with	*/
-  /* other versions.							*/
-  typedef long unsigned int caddr_t;
-#endif
-
-#ifdef PCR
-# include "il/PCR_IL.h"
-# include "th/PCR_ThCtl.h"
-# include "mm/PCR_MM.h"
-#endif
-
-#if !defined(NO_EXECUTE_PERMISSION)
-# define OPT_PROT_EXEC PROT_EXEC
-#else
-# define OPT_PROT_EXEC 0
-#endif
-
-#if defined(LINUX) && \
-    (defined(USE_PROC_FOR_LIBRARIES) || defined(IA64) || !defined(SMALL_CONFIG))
-
-/* We need to parse /proc/self/maps, either to find dynamic libraries,	*/
-/* and/or to find the register backing store base (IA64).  Do it once	*/
-/* here.								*/
-
-#define READ read
-
-/* Repeatedly perform a read call until the buffer is filled or	*/
-/* we encounter EOF.						*/
-ssize_t GC_repeat_read(int fd, char *buf, size_t count)
-{
-    ssize_t num_read = 0;
-    ssize_t result;
-    
-    while (num_read < count) {
-	result = READ(fd, buf + num_read, count - num_read);
-	if (result < 0) return result;
-	if (result == 0) break;
-	num_read += result;
-    }
-    return num_read;
-}
-
-/*
- * Apply fn to a buffer containing the contents of /proc/self/maps.
- * Return the result of fn or, if we failed, 0.
- * We currently do nothing to /proc/self/maps other than simply read
- * it.  This code could be simplified if we could determine its size
- * ahead of time.
- */
-
-word GC_apply_to_maps(word (*fn)(char *))
-{
-    int f;
-    int result;
-    size_t maps_size = 4000;  /* Initial guess. 	*/
-    static char init_buf[1];
-    static char *maps_buf = init_buf;
-    static size_t maps_buf_sz = 1;
-
-    /* Read /proc/self/maps, growing maps_buf as necessary.	*/
-        /* Note that we may not allocate conventionally, and	*/
-        /* thus can't use stdio.				*/
-	do {
-	    if (maps_size >= maps_buf_sz) {
-	      /* Grow only by powers of 2, since we leak "too small" buffers. */
-	      while (maps_size >= maps_buf_sz) maps_buf_sz *= 2;
-	      maps_buf = GC_scratch_alloc(maps_buf_sz);
-	      if (maps_buf == 0) return 0;
-	    }
-	    f = open("/proc/self/maps", O_RDONLY);
-	    if (-1 == f) return 0;
-	    maps_size = 0;
-	    do {
-	        result = GC_repeat_read(f, maps_buf, maps_buf_sz-1);
-	        if (result <= 0) return 0;
-	        maps_size += result;
-	    } while (result == maps_buf_sz-1);
-	    close(f);
-	} while (maps_size >= maps_buf_sz);
-        maps_buf[maps_size] = '\0';
-	
-    /* Apply fn to result. */
-	return fn(maps_buf);
-}
-
-#endif /* Need GC_apply_to_maps */
-
-#if defined(LINUX) && (defined(USE_PROC_FOR_LIBRARIES) || defined(IA64))
-//
-//  GC_parse_map_entry parses an entry from /proc/self/maps so we can
-//  locate all writable data segments that belong to shared libraries.
-//  The format of one of these entries and the fields we care about
-//  is as follows:
-//  XXXXXXXX-XXXXXXXX r-xp 00000000 30:05 260537     name of mapping...\n
-//  ^^^^^^^^ ^^^^^^^^ ^^^^          ^^
-//  start    end      prot          maj_dev
-//
-//  Note that since about auguat 2003 kernels, the columns no longer have
-//  fixed offsets on 64-bit kernels.  Hence we no longer rely on fixed offsets
-//  anywhere, which is safer anyway.
-//
-
-/*
- * Assign various fields of the first line in buf_ptr to *start, *end,
- * *prot_buf and *maj_dev.  Only *prot_buf may be set for unwritable maps.
- */
-char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
-                                char *prot_buf, unsigned int *maj_dev)
-{
-    char *start_start, *end_start, *prot_start, *maj_dev_start;
-    char *p;
-    char *endp;
-
-    if (buf_ptr == NULL || *buf_ptr == '\0') {
-        return NULL;
-    }
-
-    p = buf_ptr;
-    while (isspace(*p)) ++p;
-    start_start = p;
-    GC_ASSERT(isxdigit(*start_start));
-    *start = strtoul(start_start, &endp, 16); p = endp;
-    GC_ASSERT(*p=='-');
-
-    ++p;
-    end_start = p;
-    GC_ASSERT(isxdigit(*end_start));
-    *end = strtoul(end_start, &endp, 16); p = endp;
-    GC_ASSERT(isspace(*p));
-
-    while (isspace(*p)) ++p;
-    prot_start = p;
-    GC_ASSERT(*prot_start == 'r' || *prot_start == '-');
-    memcpy(prot_buf, prot_start, 4);
-    prot_buf[4] = '\0';
-    if (prot_buf[1] == 'w') {/* we can skip the rest if it's not writable. */
-	/* Skip past protection field to offset field */
-          while (!isspace(*p)) ++p; while (isspace(*p)) ++p;
-          GC_ASSERT(isxdigit(*p));
-	/* Skip past offset field, which we ignore */
-          while (!isspace(*p)) ++p; while (isspace(*p)) ++p;
-	maj_dev_start = p;
-        GC_ASSERT(isxdigit(*maj_dev_start));
-        *maj_dev = strtoul(maj_dev_start, NULL, 16);
-    }
-
-    while (*p && *p++ != '\n');
-
-    return p;
-}
-
-#endif /* Need to parse /proc/self/maps. */	
-
-#if defined(SEARCH_FOR_DATA_START)
-  /* The I386 case can be handled without a search.  The Alpha case	*/
-  /* used to be handled differently as well, but the rules changed	*/
-  /* for recent Linux versions.  This seems to be the easiest way to	*/
-  /* cover all versions.						*/
-
-# if defined(LINUX) || defined(HURD)
-    /* Some Linux distributions arrange to define __data_start.  Some	*/
-    /* define data_start as a weak symbol.  The latter is technically	*/
-    /* broken, since the user program may define data_start, in which	*/
-    /* case we lose.  Nonetheless, we try both, prefering __data_start.	*/
-    /* We assume gcc-compatible pragmas.	*/
-#   pragma weak __data_start
-    extern int __data_start[];
-#   pragma weak data_start
-    extern int data_start[];
-# endif /* LINUX */
-  extern int _end[];
-
-  ptr_t GC_data_start;
-
-  void GC_init_linux_data_start()
-  {
-    extern ptr_t GC_find_limit();
-
-#   if defined(LINUX) || defined(HURD)
-      /* Try the easy approaches first:	*/
-      if ((ptr_t)__data_start != 0) {
-	  GC_data_start = (ptr_t)(__data_start);
-	  return;
-      }
-      if ((ptr_t)data_start != 0) {
-	  GC_data_start = (ptr_t)(data_start);
-	  return;
-      }
-#   endif /* LINUX */
-    GC_data_start = GC_find_limit((ptr_t)(_end), FALSE);
-  }
-#endif
-
-# ifdef ECOS
-
-# ifndef ECOS_GC_MEMORY_SIZE
-# define ECOS_GC_MEMORY_SIZE (448 * 1024)
-# endif /* ECOS_GC_MEMORY_SIZE */
-
-// setjmp() function, as described in ANSI para 7.6.1.1
-#undef SETJMP
-#define SETJMP( __env__ )  hal_setjmp( __env__ )
-
-// FIXME: This is a simple way of allocating memory which is
-// compatible with ECOS early releases.  Later releases use a more
-// sophisticated means of allocating memory than this simple static
-// allocator, but this method is at least bound to work.
-static char memory[ECOS_GC_MEMORY_SIZE];
-static char *brk = memory;
-
-static void *tiny_sbrk(ptrdiff_t increment)
-{
-  void *p = brk;
-
-  brk += increment;
-
-  if (brk >  memory + sizeof memory)
-    {
-      brk -= increment;
-      return NULL;
-    }
-
-  return p;
-}
-#define sbrk tiny_sbrk
-# endif /* ECOS */
-
-#if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__)
-  ptr_t GC_data_start;
-
-  void GC_init_netbsd_elf()
-  {
-    extern ptr_t GC_find_limit();
-    extern char **environ;
-	/* This may need to be environ, without the underscore, for	*/
-	/* some versions.						*/
-    GC_data_start = GC_find_limit((ptr_t)&environ, FALSE);
-  }
-#endif
-
-# ifdef OS2
-
-# include <stddef.h>
-
-# if !defined(__IBMC__) && !defined(__WATCOMC__) /* e.g. EMX */
-
-struct exe_hdr {
-    unsigned short      magic_number;
-    unsigned short      padding[29];
-    long                new_exe_offset;
-};
-
-#define E_MAGIC(x)      (x).magic_number
-#define EMAGIC          0x5A4D  
-#define E_LFANEW(x)     (x).new_exe_offset
-
-struct e32_exe {
-    unsigned char       magic_number[2]; 
-    unsigned char       byte_order; 
-    unsigned char       word_order; 
-    unsigned long       exe_format_level;
-    unsigned short      cpu;       
-    unsigned short      os;
-    unsigned long       padding1[13];
-    unsigned long       object_table_offset;
-    unsigned long       object_count;    
-    unsigned long       padding2[31];
-};
-
-#define E32_MAGIC1(x)   (x).magic_number[0]
-#define E32MAGIC1       'L'
-#define E32_MAGIC2(x)   (x).magic_number[1]
-#define E32MAGIC2       'X'
-#define E32_BORDER(x)   (x).byte_order
-#define E32LEBO         0
-#define E32_WORDER(x)   (x).word_order
-#define E32LEWO         0
-#define E32_CPU(x)      (x).cpu
-#define E32CPU286       1
-#define E32_OBJTAB(x)   (x).object_table_offset
-#define E32_OBJCNT(x)   (x).object_count
-
-struct o32_obj {
-    unsigned long       size;  
-    unsigned long       base;
-    unsigned long       flags;  
-    unsigned long       pagemap;
-    unsigned long       mapsize; 
-    unsigned long       reserved;
-};
-
-#define O32_FLAGS(x)    (x).flags
-#define OBJREAD         0x0001L
-#define OBJWRITE        0x0002L
-#define OBJINVALID      0x0080L
-#define O32_SIZE(x)     (x).size
-#define O32_BASE(x)     (x).base
-
-# else  /* IBM's compiler */
-
-/* A kludge to get around what appears to be a header file bug */
-# ifndef WORD
-#   define WORD unsigned short
-# endif
-# ifndef DWORD
-#   define DWORD unsigned long
-# endif
-
-# define EXE386 1
-# include <newexe.h>
-# include <exe386.h>
-
-# endif  /* __IBMC__ */
-
-# define INCL_DOSEXCEPTIONS
-# define INCL_DOSPROCESS
-# define INCL_DOSERRORS
-# define INCL_DOSMODULEMGR
-# define INCL_DOSMEMMGR
-# include <os2.h>
-
-
-/* Disable and enable signals during nontrivial allocations	*/
-
-void GC_disable_signals(void)
-{
-    ULONG nest;
-    
-    DosEnterMustComplete(&nest);
-    if (nest != 1) ABORT("nested GC_disable_signals");
-}
-
-void GC_enable_signals(void)
-{
-    ULONG nest;
-    
-    DosExitMustComplete(&nest);
-    if (nest != 0) ABORT("GC_enable_signals");
-}
-
-
-# else
-
-#  if !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
-      && !defined(MSWINCE) \
-      && !defined(MACOS) && !defined(DJGPP) && !defined(DOS4GW) \
-      && !defined(NOSYS) && !defined(ECOS)
-
-#   if defined(SIG_BLOCK)
-	/* Use POSIX/SYSV interface */
-#	define SIGSET_T sigset_t
-#	define SIG_DEL(set, signal) sigdelset(&(set), (signal))
-#	define SIG_FILL(set) sigfillset(&set)
-#	define SIGSETMASK(old, new) sigprocmask(SIG_SETMASK, &(new), &(old))
-#   elif defined(sigmask) && !defined(UTS4) && !defined(HURD)
-	/* Use the traditional BSD interface */
-#	define SIGSET_T int
-#	define SIG_DEL(set, signal) (set) &= ~(sigmask(signal))
-#	define SIG_FILL(set)  (set) = 0x7fffffff
-    	  /* Setting the leading bit appears to provoke a bug in some	*/
-    	  /* longjmp implementations.  Most systems appear not to have	*/
-    	  /* a signal 32.						*/
-#	define SIGSETMASK(old, new) (old) = sigsetmask(new)
-#   else
-#       error undetectable signal API
-#   endif
-
-static GC_bool mask_initialized = FALSE;
-
-static SIGSET_T new_mask;
-
-static SIGSET_T old_mask;
-
-static SIGSET_T dummy;
-
-#if defined(PRINTSTATS) && !defined(THREADS)
-# define CHECK_SIGNALS
-  int GC_sig_disabled = 0;
-#endif
-
-void GC_disable_signals()
-{
-    if (!mask_initialized) {
-    	SIG_FILL(new_mask);
-
-	SIG_DEL(new_mask, SIGSEGV);
-	SIG_DEL(new_mask, SIGILL);
-	SIG_DEL(new_mask, SIGQUIT);
-#	ifdef SIGBUS
-	    SIG_DEL(new_mask, SIGBUS);
-#	endif
-#	ifdef SIGIOT
-	    SIG_DEL(new_mask, SIGIOT);
-#	endif
-#	ifdef SIGEMT
-	    SIG_DEL(new_mask, SIGEMT);
-#	endif
-#	ifdef SIGTRAP
-	    SIG_DEL(new_mask, SIGTRAP);
-#	endif 
-	mask_initialized = TRUE;
-    }
-#   ifdef CHECK_SIGNALS
-	if (GC_sig_disabled != 0) ABORT("Nested disables");
-	GC_sig_disabled++;
-#   endif
-    SIGSETMASK(old_mask,new_mask);
-}
-
-void GC_enable_signals()
-{
-#   ifdef CHECK_SIGNALS
-	if (GC_sig_disabled != 1) ABORT("Unmatched enable");
-	GC_sig_disabled--;
-#   endif
-    SIGSETMASK(dummy,old_mask);
-}
-
-#  endif  /* !PCR */
-
-# endif /*!OS/2 */
-
-/* Ivan Demakov: simplest way (to me) */
-#if defined (DOS4GW)
-  void GC_disable_signals() { }
-  void GC_enable_signals() { }
-#endif
-
-/* Find the page size */
-word GC_page_size;
-
-# if defined(MSWIN32) || defined(MSWINCE) || defined (CYGWIN32)
-  void GC_setpagesize()
-  {
-    GetSystemInfo(&GC_sysinfo);
-    GC_page_size = GC_sysinfo.dwPageSize;
-  }
-
-# else
-#   if defined(MPROTECT_VDB) || defined(PROC_VDB) || defined(USE_MMAP) \
-       || defined(USE_MUNMAP)
-	void GC_setpagesize()
-	{
-	    GC_page_size = GETPAGESIZE();
-	}
-#   else
-	/* It's acceptable to fake it. */
-	void GC_setpagesize()
-	{
-	    GC_page_size = HBLKSIZE;
-	}
-#   endif
-# endif
-
-/* 
- * Find the base of the stack. 
- * Used only in single-threaded environment.
- * With threads, GC_mark_roots needs to know how to do this.
- * Called with allocator lock held.
- */
-# if defined(MSWIN32) || defined(MSWINCE)
-# define is_writable(prot) ((prot) == PAGE_READWRITE \
-			    || (prot) == PAGE_WRITECOPY \
-			    || (prot) == PAGE_EXECUTE_READWRITE \
-			    || (prot) == PAGE_EXECUTE_WRITECOPY)
-/* Return the number of bytes that are writable starting at p.	*/
-/* The pointer p is assumed to be page aligned.			*/
-/* If base is not 0, *base becomes the beginning of the 	*/
-/* allocation region containing p.				*/
-word GC_get_writable_length(ptr_t p, ptr_t *base)
-{
-    MEMORY_BASIC_INFORMATION buf;
-    word result;
-    word protect;
-    
-    result = VirtualQuery(p, &buf, sizeof(buf));
-    if (result != sizeof(buf)) ABORT("Weird VirtualQuery result");
-    if (base != 0) *base = (ptr_t)(buf.AllocationBase);
-    protect = (buf.Protect & ~(PAGE_GUARD | PAGE_NOCACHE));
-    if (!is_writable(protect)) {
-        return(0);
-    }
-    if (buf.State != MEM_COMMIT) return(0);
-    return(buf.RegionSize);
-}
-
-ptr_t GC_get_stack_base()
-{
-    int dummy;
-    ptr_t sp = (ptr_t)(&dummy);
-    ptr_t trunc_sp = (ptr_t)((word)sp & ~(GC_page_size - 1));
-    word size = GC_get_writable_length(trunc_sp, 0);
-   
-    return(trunc_sp + size);
-}
-
-
-# endif /* MS Windows */
-
-# ifdef BEOS
-# include <kernel/OS.h>
-ptr_t GC_get_stack_base(){
-	thread_info th;
-	get_thread_info(find_thread(NULL),&th);
-	return th.stack_end;
-}
-# endif /* BEOS */
-
-
-# ifdef OS2
-
-ptr_t GC_get_stack_base()
-{
-    PTIB ptib;
-    PPIB ppib;
-    
-    if (DosGetInfoBlocks(&ptib, &ppib) != NO_ERROR) {
-    	GC_err_printf0("DosGetInfoBlocks failed\n");
-    	ABORT("DosGetInfoBlocks failed\n");
-    }
-    return((ptr_t)(ptib -> tib_pstacklimit));
-}
-
-# endif /* OS2 */
-
-# ifdef AMIGA
-#   define GC_AMIGA_SB
-#   include "AmigaOS.c"
-#   undef GC_AMIGA_SB
-# endif /* AMIGA */
-
-# if defined(NEED_FIND_LIMIT) || defined(UNIX_LIKE)
-
-#   ifdef __STDC__
-	typedef void (*handler)(int);
-#   else
-	typedef void (*handler)();
-#   endif
-
-#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \
-    || defined(HURD) || defined(NETBSD)
-	static struct sigaction old_segv_act;
-#	if defined(IRIX5) || defined(HPUX) \
-	|| defined(HURD) || defined(NETBSD)
-	    static struct sigaction old_bus_act;
-#	endif
-#   else
-        static handler old_segv_handler, old_bus_handler;
-#   endif
-    
-#   ifdef __STDC__
-      void GC_set_and_save_fault_handler(handler h)
-#   else
-      void GC_set_and_save_fault_handler(h)
-      handler h;
-#   endif
-    {
-#	if defined(SUNOS5SIGS) || defined(IRIX5)  \
-        || defined(OSF1) || defined(HURD) || defined(NETBSD)
-	  struct sigaction	act;
-
-	  act.sa_handler	= h;
-#	  if 0 /* Was necessary for Solaris 2.3 and very temporary 	*/
-	       /* NetBSD bugs.						*/
-            act.sa_flags          = SA_RESTART | SA_NODEFER;
-#         else
-            act.sa_flags          = SA_RESTART;
-#	  endif
-
-	  (void) sigemptyset(&act.sa_mask);
-#	  ifdef GC_IRIX_THREADS
-		/* Older versions have a bug related to retrieving and	*/
-		/* and setting a handler at the same time.		*/
-	        (void) sigaction(SIGSEGV, 0, &old_segv_act);
-	        (void) sigaction(SIGSEGV, &act, 0);
-	        (void) sigaction(SIGBUS, 0, &old_bus_act);
-	        (void) sigaction(SIGBUS, &act, 0);
-#	  else
-	        (void) sigaction(SIGSEGV, &act, &old_segv_act);
-#		if defined(IRIX5) \
-		   || defined(HPUX) || defined(HURD) || defined(NETBSD)
-		    /* Under Irix 5.x or HP/UX, we may get SIGBUS.	*/
-		    /* Pthreads doesn't exist under Irix 5.x, so we	*/
-		    /* don't have to worry in the threads case.		*/
-		    (void) sigaction(SIGBUS, &act, &old_bus_act);
-#		endif
-#	  endif	/* GC_IRIX_THREADS */
-#	else
-    	  old_segv_handler = signal(SIGSEGV, h);
-#	  ifdef SIGBUS
-	    old_bus_handler = signal(SIGBUS, h);
-#	  endif
-#	endif
-    }
-# endif /* NEED_FIND_LIMIT || UNIX_LIKE */
-
-# ifdef NEED_FIND_LIMIT
-  /* Some tools to implement HEURISTIC2	*/
-#   define MIN_PAGE_SIZE 256	/* Smallest conceivable page size, bytes */
-    /* static */ JMP_BUF GC_jmp_buf;
-    
-    /*ARGSUSED*/
-    void GC_fault_handler(sig)
-    int sig;
-    {
-        LONGJMP(GC_jmp_buf, 1);
-    }
-
-    void GC_setup_temporary_fault_handler()
-    {
-	GC_set_and_save_fault_handler(GC_fault_handler);
-    }
-    
-    void GC_reset_fault_handler()
-    {
-#       if defined(SUNOS5SIGS) || defined(IRIX5) \
-	   || defined(OSF1) || defined(HURD) || defined(NETBSD)
-	  (void) sigaction(SIGSEGV, &old_segv_act, 0);
-#	  if defined(IRIX5) \
-	     || defined(HPUX) || defined(HURD) || defined(NETBSD)
-	      (void) sigaction(SIGBUS, &old_bus_act, 0);
-#	  endif
-#       else
-  	  (void) signal(SIGSEGV, old_segv_handler);
-#	  ifdef SIGBUS
-	    (void) signal(SIGBUS, old_bus_handler);
-#	  endif
-#       endif
-    }
-
-    /* Return the first nonaddressible location > p (up) or 	*/
-    /* the smallest location q s.t. [q,p) is addressable (!up).	*/
-    /* We assume that p (up) or p-1 (!up) is addressable.	*/
-    ptr_t GC_find_limit(p, up)
-    ptr_t p;
-    GC_bool up;
-    {
-        static VOLATILE ptr_t result;
-    		/* Needs to be static, since otherwise it may not be	*/
-    		/* preserved across the longjmp.  Can safely be 	*/
-    		/* static since it's only called once, with the		*/
-    		/* allocation lock held.				*/
-
-
-	GC_setup_temporary_fault_handler();
-	if (SETJMP(GC_jmp_buf) == 0) {
-	    result = (ptr_t)(((word)(p))
-			      & ~(MIN_PAGE_SIZE-1));
-	    for (;;) {
- 	        if (up) {
-		    result += MIN_PAGE_SIZE;
- 	        } else {
-		    result -= MIN_PAGE_SIZE;
- 	        }
-		GC_noop1((word)(*result));
-	    }
-	}
-	GC_reset_fault_handler();
- 	if (!up) {
-	    result += MIN_PAGE_SIZE;
- 	}
-	return(result);
-    }
-# endif
-
-#if defined(ECOS) || defined(NOSYS)
-  ptr_t GC_get_stack_base()
-  {
-    return STACKBOTTOM;
-  }
-#endif
-
-#ifdef HPUX_STACKBOTTOM
-
-#include <sys/param.h>
-#include <sys/pstat.h>
-
-  ptr_t GC_get_register_stack_base(void)
-  {
-    struct pst_vm_status vm_status;
-
-    int i = 0;
-    while (pstat_getprocvm(&vm_status, sizeof(vm_status), 0, i++) == 1) {
-      if (vm_status.pst_type == PS_RSESTACK) {
-        return (ptr_t) vm_status.pst_vaddr;
-      }
-    }
-
-    /* old way to get the register stackbottom */
-    return (ptr_t)(((word)GC_stackbottom - BACKING_STORE_DISPLACEMENT - 1)
-                   & ~(BACKING_STORE_ALIGNMENT - 1));
-  }
-
-#endif /* HPUX_STACK_BOTTOM */
-
-#ifdef LINUX_STACKBOTTOM
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-# define STAT_SKIP 27   /* Number of fields preceding startstack	*/
-			/* field in /proc/self/stat			*/
-
-#ifdef USE_LIBC_PRIVATES
-# pragma weak __libc_stack_end
-  extern ptr_t __libc_stack_end;
-#endif
-
-# ifdef IA64
-    /* Try to read the backing store base from /proc/self/maps.	*/
-    /* We look for the writable mapping with a 0 major device,  */
-    /* which is	as close to our frame as possible, but below it.*/
-    static word backing_store_base_from_maps(char *maps)
-    {
-      char prot_buf[5];
-      char *buf_ptr = maps;
-      word start, end;
-      unsigned int maj_dev;
-      word current_best = 0;
-      word dummy;
-  
-      for (;;) {
-        buf_ptr = GC_parse_map_entry(buf_ptr, &start, &end, prot_buf, &maj_dev);
-	if (buf_ptr == NULL) return current_best;
-	if (prot_buf[1] == 'w' && maj_dev == 0) {
-	    if (end < (word)(&dummy) && start > current_best) current_best = start;
-	}
-      }
-      return current_best;
-    }
-
-    static word backing_store_base_from_proc(void)
-    {
-        return GC_apply_to_maps(backing_store_base_from_maps);
-    }
-
-#   ifdef USE_LIBC_PRIVATES
-#     pragma weak __libc_ia64_register_backing_store_base
-      extern ptr_t __libc_ia64_register_backing_store_base;
-#   endif
-
-    ptr_t GC_get_register_stack_base(void)
-    {
-#     ifdef USE_LIBC_PRIVATES
-        if (0 != &__libc_ia64_register_backing_store_base
-	    && 0 != __libc_ia64_register_backing_store_base) {
-	  /* Glibc 2.2.4 has a bug such that for dynamically linked	*/
-	  /* executables __libc_ia64_register_backing_store_base is 	*/
-	  /* defined but uninitialized during constructor calls.  	*/
-	  /* Hence we check for both nonzero address and value.		*/
-	  return __libc_ia64_register_backing_store_base;
-        }
-#     endif
-      word result = backing_store_base_from_proc();
-      if (0 == result) {
-	  /* Use dumb heuristics.  Works only for default configuration. */
-	  result = (word)GC_stackbottom - BACKING_STORE_DISPLACEMENT;
-	  result += BACKING_STORE_ALIGNMENT - 1;
-	  result &= ~(BACKING_STORE_ALIGNMENT - 1);
-	  /* Verify that it's at least readable.  If not, we goofed. */
-	  GC_noop1(*(word *)result); 
-      }
-      return (ptr_t)result;
-    }
-# endif
-
-  ptr_t GC_linux_stack_base(void)
-  {
-    /* We read the stack base value from /proc/self/stat.  We do this	*/
-    /* using direct I/O system calls in order to avoid calling malloc   */
-    /* in case REDIRECT_MALLOC is defined.				*/ 
-#   define STAT_BUF_SIZE 4096
-#   define STAT_READ read
-	  /* Should probably call the real read, if read is wrapped.	*/
-    char stat_buf[STAT_BUF_SIZE];
-    int f;
-    char c;
-    word result = 0;
-    size_t i, buf_offset = 0;
-
-    /* First try the easy way.  This should work for glibc 2.2	*/
-    /* This fails in a prelinked ("prelink" command) executable */
-    /* since the correct value of __libc_stack_end never	*/
-    /* becomes visible to us.  The second test works around 	*/
-    /* this.							*/  
-#   ifdef USE_LIBC_PRIVATES
-      if (0 != &__libc_stack_end && 0 != __libc_stack_end ) {
-#       ifdef IA64
-	  /* Some versions of glibc set the address 16 bytes too	*/
-	  /* low while the initialization code is running.		*/
-	  if (((word)__libc_stack_end & 0xfff) + 0x10 < 0x1000) {
-	    return __libc_stack_end + 0x10;
-	  } /* Otherwise it's not safe to add 16 bytes and we fall	*/
-	    /* back to using /proc.					*/
-#	else 
-#	ifdef SPARC
-	  /* Older versions of glibc for 64-bit Sparc do not set
-	   * this variable correctly, it gets set to either zero
-	   * or one.
-	   */
-	  if (__libc_stack_end != (ptr_t) (unsigned long)0x1)
-	    return __libc_stack_end;
-#	else
-	  return __libc_stack_end;
-#	endif
-#	endif
-      }
-#   endif
-    f = open("/proc/self/stat", O_RDONLY);
-    if (f < 0 || STAT_READ(f, stat_buf, STAT_BUF_SIZE) < 2 * STAT_SKIP) {
-	ABORT("Couldn't read /proc/self/stat");
-    }
-    c = stat_buf[buf_offset++];
-    /* Skip the required number of fields.  This number is hopefully	*/
-    /* constant across all Linux implementations.			*/
-      for (i = 0; i < STAT_SKIP; ++i) {
-	while (isspace(c)) c = stat_buf[buf_offset++];
-	while (!isspace(c)) c = stat_buf[buf_offset++];
-      }
-    while (isspace(c)) c = stat_buf[buf_offset++];
-    while (isdigit(c)) {
-      result *= 10;
-      result += c - '0';
-      c = stat_buf[buf_offset++];
-    }
-    close(f);
-    if (result < 0x10000000) ABORT("Absurd stack bottom value");
-    return (ptr_t)result;
-  }
-
-#endif /* LINUX_STACKBOTTOM */
-
-#ifdef FREEBSD_STACKBOTTOM
-
-/* This uses an undocumented sysctl call, but at least one expert 	*/
-/* believes it will stay.						*/
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-  ptr_t GC_freebsd_stack_base(void)
-  {
-    int nm[2] = {CTL_KERN, KERN_USRSTACK};
-    ptr_t base;
-    size_t len = sizeof(ptr_t);
-    int r = sysctl(nm, 2, &base, &len, NULL, 0);
-    
-    if (r) ABORT("Error getting stack base");
-
-    return base;
-  }
-
-#endif /* FREEBSD_STACKBOTTOM */
-
-#ifdef SOLARIS_STACKBOTTOM
-
-# include <thread.h>
-# include <signal.h>
-# include <pthread.h>
-
-  /* These variables are used to cache ss_sp value for the primordial   */
-  /* thread (it's better not to call thr_stksegment() twice for this    */
-  /* thread - see JDK bug #4352906).                                    */
-  static pthread_t stackbase_main_self = 0;
-                        /* 0 means stackbase_main_ss_sp value is unset. */
-  static void *stackbase_main_ss_sp = NULL;
-
-  ptr_t GC_solaris_stack_base(void)
-  {
-    stack_t s;
-    pthread_t self = pthread_self();
-    if (self == stackbase_main_self)
-      {
-        /* If the client calls GC_get_stack_base() from the main thread */
-        /* then just return the cached value.                           */
-        GC_ASSERT(stackbase_main_ss_sp != NULL);
-        return stackbase_main_ss_sp;
-      }
-
-    if (thr_stksegment(&s)) {
-      /* According to the manual, the only failure error code returned  */
-      /* is EAGAIN meaning "the information is not available due to the */
-      /* thread is not yet completely initialized or it is an internal  */
-      /* thread" - this shouldn't happen here.                          */
-      ABORT("thr_stksegment failed");
-    }
-    /* s.ss_sp holds the pointer to the stack bottom. */
-    GC_ASSERT((void *)&s HOTTER_THAN s.ss_sp);
-
-    if (!stackbase_main_self)
-      {
-        /* Cache the stack base value for the primordial thread (this   */
-        /* is done during GC_init, so there is no race).                */
-        stackbase_main_ss_sp = s.ss_sp;
-        stackbase_main_self = self;
-      }
-
-    return s.ss_sp;
-  }
-
-#endif /* GC_SOLARIS_THREADS */
-
-#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \
-    && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS)
-
-ptr_t GC_get_stack_base()
-{
-#   if defined(HEURISTIC1) || defined(HEURISTIC2) || \
-       defined(LINUX_STACKBOTTOM) || defined(FREEBSD_STACKBOTTOM) || \
-       defined(SOLARIS_STACKBOTTOM)       
-    word dummy;
-    ptr_t result;
-#   endif
-
-#   define STACKBOTTOM_ALIGNMENT_M1 ((word)STACK_GRAN - 1)
-
-#   ifdef STACKBOTTOM
-	return(STACKBOTTOM);
-#   else
-#	ifdef HEURISTIC1
-#	   ifdef STACK_GROWS_DOWN
-	     result = (ptr_t)((((word)(&dummy))
-	     		       + STACKBOTTOM_ALIGNMENT_M1)
-			      & ~STACKBOTTOM_ALIGNMENT_M1);
-#	   else
-	     result = (ptr_t)(((word)(&dummy))
-			      & ~STACKBOTTOM_ALIGNMENT_M1);
-#	   endif
-#	endif /* HEURISTIC1 */
-#	ifdef LINUX_STACKBOTTOM
-	   result = GC_linux_stack_base();
-#	endif
-#	ifdef FREEBSD_STACKBOTTOM
-	   result = GC_freebsd_stack_base();
-#	endif
-#	ifdef SOLARIS_STACKBOTTOM
-	   result = GC_solaris_stack_base();
-#	endif
-#	ifdef HEURISTIC2
-#	    ifdef STACK_GROWS_DOWN
-		result = GC_find_limit((ptr_t)(&dummy), TRUE);
-#           	ifdef HEURISTIC2_LIMIT
-		    if (result > HEURISTIC2_LIMIT
-		        && (ptr_t)(&dummy) < HEURISTIC2_LIMIT) {
-		            result = HEURISTIC2_LIMIT;
-		    }
-#	        endif
-#	    else
-		result = GC_find_limit((ptr_t)(&dummy), FALSE);
-#           	ifdef HEURISTIC2_LIMIT
-		    if (result < HEURISTIC2_LIMIT
-		        && (ptr_t)(&dummy) > HEURISTIC2_LIMIT) {
-		            result = HEURISTIC2_LIMIT;
-		    }
-#	        endif
-#	    endif
-
-#	endif /* HEURISTIC2 */
-#	ifdef STACK_GROWS_DOWN
-	    if (result == 0) result = (ptr_t)(signed_word)(-sizeof(ptr_t));
-#	endif
-    	return(result);
-#   endif /* STACKBOTTOM */
-}
-
-# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */
-
-/*
- * Register static data segment(s) as roots.
- * If more data segments are added later then they need to be registered
- * add that point (as we do with SunOS dynamic loading),
- * or GC_mark_roots needs to check for them (as we do with PCR).
- * Called with allocator lock held.
- */
-
-# ifdef OS2
-
-void GC_register_data_segments()
-{
-    PTIB ptib;
-    PPIB ppib;
-    HMODULE module_handle;
-#   define PBUFSIZ 512
-    UCHAR path[PBUFSIZ];
-    FILE * myexefile;
-    struct exe_hdr hdrdos;	/* MSDOS header.	*/
-    struct e32_exe hdr386;	/* Real header for my executable */
-    struct o32_obj seg;	/* Currrent segment */
-    int nsegs;
-    
-    
-    if (DosGetInfoBlocks(&ptib, &ppib) != NO_ERROR) {
-    	GC_err_printf0("DosGetInfoBlocks failed\n");
-    	ABORT("DosGetInfoBlocks failed\n");
-    }
-    module_handle = ppib -> pib_hmte;
-    if (DosQueryModuleName(module_handle, PBUFSIZ, path) != NO_ERROR) {
-    	GC_err_printf0("DosQueryModuleName failed\n");
-    	ABORT("DosGetInfoBlocks failed\n");
-    }
-    myexefile = fopen(path, "rb");
-    if (myexefile == 0) {
-        GC_err_puts("Couldn't open executable ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Failed to open executable\n");
-    }
-    if (fread((char *)(&hdrdos), 1, sizeof hdrdos, myexefile) < sizeof hdrdos) {
-        GC_err_puts("Couldn't read MSDOS header from ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Couldn't read MSDOS header");
-    }
-    if (E_MAGIC(hdrdos) != EMAGIC) {
-        GC_err_puts("Executable has wrong DOS magic number: ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Bad DOS magic number");
-    }
-    if (fseek(myexefile, E_LFANEW(hdrdos), SEEK_SET) != 0) {
-        GC_err_puts("Seek to new header failed in ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Bad DOS magic number");
-    }
-    if (fread((char *)(&hdr386), 1, sizeof hdr386, myexefile) < sizeof hdr386) {
-        GC_err_puts("Couldn't read MSDOS header from ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Couldn't read OS/2 header");
-    }
-    if (E32_MAGIC1(hdr386) != E32MAGIC1 || E32_MAGIC2(hdr386) != E32MAGIC2) {
-        GC_err_puts("Executable has wrong OS/2 magic number:");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Bad OS/2 magic number");
-    }
-    if ( E32_BORDER(hdr386) != E32LEBO || E32_WORDER(hdr386) != E32LEWO) {
-        GC_err_puts("Executable %s has wrong byte order: ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Bad byte order");
-    }
-    if ( E32_CPU(hdr386) == E32CPU286) {
-        GC_err_puts("GC can't handle 80286 executables: ");
-        GC_err_puts(path); GC_err_puts("\n");
-        EXIT();
-    }
-    if (fseek(myexefile, E_LFANEW(hdrdos) + E32_OBJTAB(hdr386),
-    	      SEEK_SET) != 0) {
-        GC_err_puts("Seek to object table failed: ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Seek to object table failed");
-    }
-    for (nsegs = E32_OBJCNT(hdr386); nsegs > 0; nsegs--) {
-      int flags;
-      if (fread((char *)(&seg), 1, sizeof seg, myexefile) < sizeof seg) {
-        GC_err_puts("Couldn't read obj table entry from ");
-        GC_err_puts(path); GC_err_puts("\n");
-        ABORT("Couldn't read obj table entry");
-      }
-      flags = O32_FLAGS(seg);
-      if (!(flags & OBJWRITE)) continue;
-      if (!(flags & OBJREAD)) continue;
-      if (flags & OBJINVALID) {
-          GC_err_printf0("Object with invalid pages?\n");
-          continue;
-      } 
-      GC_add_roots_inner(O32_BASE(seg), O32_BASE(seg)+O32_SIZE(seg), FALSE);
-    }
-}
-
-# else /* !OS2 */
-
-# if defined(MSWIN32) || defined(MSWINCE) || defined (CYGWIN32)
-
-# ifdef CYGWIN32
-#    define GC_no_win32_dlls (FALSE)
-# endif
-
-# ifdef MSWIN32
-  /* Unfortunately, we have to handle win32s very differently from NT, 	*/
-  /* Since VirtualQuery has very different semantics.  In particular,	*/
-  /* under win32s a VirtualQuery call on an unmapped page returns an	*/
-  /* invalid result.  Under NT, GC_register_data_segments is a noop and	*/
-  /* all real work is done by GC_register_dynamic_libraries.  Under	*/
-  /* win32s, we cannot find the data segments associated with dll's.	*/
-  /* We register the main data segment here.				*/
-  GC_bool GC_no_win32_dlls = FALSE;	 
-  	/* This used to be set for gcc, to avoid dealing with		*/
-  	/* the structured exception handling issues.  But we now have	*/
-  	/* assembly code to do that right.				*/
-  GC_bool GC_wnt = FALSE;
-        /* This is a Windows NT derivative, i.e. NT, W2K, XP or later.  */
-  
-  void GC_init_win32()
-  {
-    /* if we're running under win32s, assume that no DLLs will be loaded */
-    DWORD v = GetVersion();
-    GC_wnt = !(v & 0x80000000);
-    GC_no_win32_dlls |= ((!GC_wnt) && (v & 0xff) <= 3);
-  }
-
-  /* Return the smallest address a such that VirtualQuery		*/
-  /* returns correct results for all addresses between a and start.	*/
-  /* Assumes VirtualQuery returns correct information for start.	*/
-  ptr_t GC_least_described_address(ptr_t start)
-  {  
-    MEMORY_BASIC_INFORMATION buf;
-    DWORD result;
-    LPVOID limit;
-    ptr_t p;
-    LPVOID q;
-    
-    limit = GC_sysinfo.lpMinimumApplicationAddress;
-    p = (ptr_t)((word)start & ~(GC_page_size - 1));
-    for (;;) {
-    	q = (LPVOID)(p - GC_page_size);
-    	if ((ptr_t)q > (ptr_t)p /* underflow */ || q < limit) break;
-    	result = VirtualQuery(q, &buf, sizeof(buf));
-    	if (result != sizeof(buf) || buf.AllocationBase == 0) break;
-    	p = (ptr_t)(buf.AllocationBase);
-    }
-    return(p);
-  }
-# endif
-
-# ifndef REDIRECT_MALLOC
-  /* We maintain a linked list of AllocationBase values that we know	*/
-  /* correspond to malloc heap sections.  Currently this is only called */
-  /* during a GC.  But there is some hope that for long running		*/
-  /* programs we will eventually see most heap sections.		*/
-
-  /* In the long run, it would be more reliable to occasionally walk 	*/
-  /* the malloc heap with HeapWalk on the default heap.  But that	*/
-  /* apparently works only for NT-based Windows. 			*/ 
-
-  /* In the long run, a better data structure would also be nice ...	*/
-  struct GC_malloc_heap_list {
-    void * allocation_base;
-    struct GC_malloc_heap_list *next;
-  } *GC_malloc_heap_l = 0;
-
-  /* Is p the base of one of the malloc heap sections we already know	*/
-  /* about?								*/
-  GC_bool GC_is_malloc_heap_base(ptr_t p)
-  {
-    struct GC_malloc_heap_list *q = GC_malloc_heap_l;
-
-    while (0 != q) {
-      if (q -> allocation_base == p) return TRUE;
-      q = q -> next;
-    }
-    return FALSE;
-  }
-
-  void *GC_get_allocation_base(void *p)
-  {
-    MEMORY_BASIC_INFORMATION buf;
-    DWORD result = VirtualQuery(p, &buf, sizeof(buf));
-    if (result != sizeof(buf)) {
-      ABORT("Weird VirtualQuery result");
-    }
-    return buf.AllocationBase;
-  }
-
-  size_t GC_max_root_size = 100000;	/* Appr. largest root size.	*/
-
-  void GC_add_current_malloc_heap()
-  {
-    struct GC_malloc_heap_list *new_l =
-                 malloc(sizeof(struct GC_malloc_heap_list));
-    void * candidate = GC_get_allocation_base(new_l);
-
-    if (new_l == 0) return;
-    if (GC_is_malloc_heap_base(candidate)) {
-      /* Try a little harder to find malloc heap.			*/
-	size_t req_size = 10000;
-	do {
-	  void *p = malloc(req_size);
-	  if (0 == p) { free(new_l); return; }
- 	  candidate = GC_get_allocation_base(p);
-	  free(p);
-	  req_size *= 2;
-	} while (GC_is_malloc_heap_base(candidate)
-	         && req_size < GC_max_root_size/10 && req_size < 500000);
-	if (GC_is_malloc_heap_base(candidate)) {
-	  free(new_l); return;
-	}
-    }
-#   ifdef CONDPRINT
-      if (GC_print_stats)
-	  GC_printf1("Found new system malloc AllocationBase at 0x%lx\n",
-                     candidate);
-#   endif
-    new_l -> allocation_base = candidate;
-    new_l -> next = GC_malloc_heap_l;
-    GC_malloc_heap_l = new_l;
-  }
-# endif /* REDIRECT_MALLOC */
-  
-  /* Is p the start of either the malloc heap, or of one of our */
-  /* heap sections?						*/
-  GC_bool GC_is_heap_base (ptr_t p)
-  {
-     
-     unsigned i;
-     
-#    ifndef REDIRECT_MALLOC
-       static word last_gc_no = -1;
-     
-       if (last_gc_no != GC_gc_no) {
-	 GC_add_current_malloc_heap();
-	 last_gc_no = GC_gc_no;
-       }
-       if (GC_root_size > GC_max_root_size) GC_max_root_size = GC_root_size;
-       if (GC_is_malloc_heap_base(p)) return TRUE;
-#    endif
-     for (i = 0; i < GC_n_heap_bases; i++) {
-         if (GC_heap_bases[i] == p) return TRUE;
-     }
-     return FALSE ;
-  }
-
-# ifdef MSWIN32
-  void GC_register_root_section(ptr_t static_root)
-  {
-      MEMORY_BASIC_INFORMATION buf;
-      DWORD result;
-      DWORD protect;
-      LPVOID p;
-      char * base;
-      char * limit, * new_limit;
-    
-      if (!GC_no_win32_dlls) return;
-      p = base = limit = GC_least_described_address(static_root);
-      while (p < GC_sysinfo.lpMaximumApplicationAddress) {
-        result = VirtualQuery(p, &buf, sizeof(buf));
-        if (result != sizeof(buf) || buf.AllocationBase == 0
-            || GC_is_heap_base(buf.AllocationBase)) break;
-        new_limit = (char *)p + buf.RegionSize;
-        protect = buf.Protect;
-        if (buf.State == MEM_COMMIT
-            && is_writable(protect)) {
-            if ((char *)p == limit) {
-                limit = new_limit;
-            } else {
-                if (base != limit) GC_add_roots_inner(base, limit, FALSE);
-                base = p;
-                limit = new_limit;
-            }
-        }
-        if (p > (LPVOID)new_limit /* overflow */) break;
-        p = (LPVOID)new_limit;
-      }
-      if (base != limit) GC_add_roots_inner(base, limit, FALSE);
-  }
-#endif
-  
-  void GC_register_data_segments()
-  {
-#     ifdef MSWIN32
-      static char dummy;
-      GC_register_root_section((ptr_t)(&dummy));
-#     endif
-  }
-
-# else /* !OS2 && !Windows */
-
-# if (defined(SVR4) || defined(AUX) || defined(DGUX) \
-      || (defined(LINUX) && defined(SPARC))) && !defined(PCR)
-ptr_t GC_SysVGetDataStart(max_page_size, etext_addr)
-int max_page_size;
-int * etext_addr;
-{
-    word text_end = ((word)(etext_addr) + sizeof(word) - 1)
-    		    & ~(sizeof(word) - 1);
-    	/* etext rounded to word boundary	*/
-    word next_page = ((text_end + (word)max_page_size - 1)
-    		      & ~((word)max_page_size - 1));
-    word page_offset = (text_end & ((word)max_page_size - 1));
-    VOLATILE char * result = (char *)(next_page + page_offset);
-    /* Note that this isnt equivalent to just adding		*/
-    /* max_page_size to &etext if &etext is at a page boundary	*/
-    
-    GC_setup_temporary_fault_handler();
-    if (SETJMP(GC_jmp_buf) == 0) {
-    	/* Try writing to the address.	*/
-    	*result = *result;
-        GC_reset_fault_handler();
-    } else {
-        GC_reset_fault_handler();
-    	/* We got here via a longjmp.  The address is not readable.	*/
-    	/* This is known to happen under Solaris 2.4 + gcc, which place	*/
-    	/* string constants in the text segment, but after etext.	*/
-    	/* Use plan B.  Note that we now know there is a gap between	*/
-    	/* text and data segments, so plan A bought us something.	*/
-    	result = (char *)GC_find_limit((ptr_t)(DATAEND), FALSE);
-    }
-    return((ptr_t)result);
-}
-# endif
-
-# if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
-/* Its unclear whether this should be identical to the above, or 	*/
-/* whether it should apply to non-X86 architectures.			*/
-/* For now we don't assume that there is always an empty page after	*/
-/* etext.  But in some cases there actually seems to be slightly more.  */
-/* This also deals with holes between read-only data and writable data.	*/
-ptr_t GC_FreeBSDGetDataStart(max_page_size, etext_addr)
-int max_page_size;
-int * etext_addr;
-{
-    word text_end = ((word)(etext_addr) + sizeof(word) - 1)
-		     & ~(sizeof(word) - 1);
-	/* etext rounded to word boundary	*/
-    VOLATILE word next_page = (text_end + (word)max_page_size - 1)
-			      & ~((word)max_page_size - 1);
-    VOLATILE ptr_t result = (ptr_t)text_end;
-    GC_setup_temporary_fault_handler();
-    if (SETJMP(GC_jmp_buf) == 0) {
-	/* Try reading at the address.				*/
-	/* This should happen before there is another thread.	*/
-	for (; next_page < (word)(DATAEND); next_page += (word)max_page_size)
-	    *(VOLATILE char *)next_page;
-	GC_reset_fault_handler();
-    } else {
-	GC_reset_fault_handler();
-	/* As above, we go to plan B	*/
-	result = GC_find_limit((ptr_t)(DATAEND), FALSE);
-    }
-    return(result);
-}
-
-# endif
-
-
-#ifdef AMIGA
-
-#  define GC_AMIGA_DS
-#  include "AmigaOS.c"
-#  undef GC_AMIGA_DS
-
-#else /* !OS2 && !Windows && !AMIGA */
-
-void GC_register_data_segments()
-{
-#   if !defined(PCR) && !defined(SRC_M3) && !defined(MACOS)
-#     if defined(REDIRECT_MALLOC) && defined(GC_SOLARIS_THREADS)
-	/* As of Solaris 2.3, the Solaris threads implementation	*/
-	/* allocates the data structure for the initial thread with	*/
-	/* sbrk at process startup.  It needs to be scanned, so that	*/
-	/* we don't lose some malloc allocated data structures		*/
-	/* hanging from it.  We're on thin ice here ...			*/
-        extern caddr_t sbrk();
-
-	GC_add_roots_inner(DATASTART, (char *)sbrk(0), FALSE);
-#     else
-	GC_add_roots_inner(DATASTART, (char *)(DATAEND), FALSE);
-#       if defined(DATASTART2)
-         GC_add_roots_inner(DATASTART2, (char *)(DATAEND2), FALSE);
-#       endif
-#     endif
-#   endif
-#   if defined(MACOS)
-    {
-#   if defined(THINK_C)
-	extern void* GC_MacGetDataStart(void);
-	/* globals begin above stack and end at a5. */
-	GC_add_roots_inner((ptr_t)GC_MacGetDataStart(),
-			   (ptr_t)LMGetCurrentA5(), FALSE);
-#   else
-#     if defined(__MWERKS__)
-#       if !__POWERPC__
-	  extern void* GC_MacGetDataStart(void);
-	  /* MATTHEW: Function to handle Far Globals (CW Pro 3) */
-#         if __option(far_data)
-	  extern void* GC_MacGetDataEnd(void);
-#         endif
-	  /* globals begin above stack and end at a5. */
-	  GC_add_roots_inner((ptr_t)GC_MacGetDataStart(),
-          		     (ptr_t)LMGetCurrentA5(), FALSE);
-	  /* MATTHEW: Handle Far Globals */          		     
-#         if __option(far_data)
-      /* Far globals follow he QD globals: */
-	  GC_add_roots_inner((ptr_t)LMGetCurrentA5(),
-          		     (ptr_t)GC_MacGetDataEnd(), FALSE);
-#         endif
-#       else
-	  extern char __data_start__[], __data_end__[];
-	  GC_add_roots_inner((ptr_t)&__data_start__,
-	  		     (ptr_t)&__data_end__, FALSE);
-#       endif /* __POWERPC__ */
-#     endif /* __MWERKS__ */
-#   endif /* !THINK_C */
-    }
-#   endif /* MACOS */
-
-    /* Dynamic libraries are added at every collection, since they may  */
-    /* change.								*/
-}
-
-# endif  /* ! AMIGA */
-# endif  /* ! MSWIN32 && ! MSWINCE*/
-# endif  /* ! OS2 */
-
-/*
- * Auxiliary routines for obtaining memory from OS.
- */
-
-# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) \
-	&& !defined(MSWIN32) && !defined(MSWINCE) \
-	&& !defined(MACOS) && !defined(DOS4GW)
-
-# ifdef SUNOS4
-    extern caddr_t sbrk();
-# endif
-# ifdef __STDC__
-#   define SBRK_ARG_T ptrdiff_t
-# else
-#   define SBRK_ARG_T int
-# endif
-
-
-# if 0 && defined(RS6000)  /* We now use mmap */
-/* The compiler seems to generate speculative reads one past the end of	*/
-/* an allocated object.  Hence we need to make sure that the page 	*/
-/* following the last heap page is also mapped.				*/
-ptr_t GC_unix_get_mem(bytes)
-word bytes;
-{
-    caddr_t cur_brk = (caddr_t)sbrk(0);
-    caddr_t result;
-    SBRK_ARG_T lsbs = (word)cur_brk & (GC_page_size-1);
-    static caddr_t my_brk_val = 0;
-    
-    if ((SBRK_ARG_T)bytes < 0) return(0); /* too big */
-    if (lsbs != 0) {
-        if((caddr_t)(sbrk(GC_page_size - lsbs)) == (caddr_t)(-1)) return(0);
-    }
-    if (cur_brk == my_brk_val) {
-    	/* Use the extra block we allocated last time. */
-        result = (ptr_t)sbrk((SBRK_ARG_T)bytes);
-        if (result == (caddr_t)(-1)) return(0);
-        result -= GC_page_size;
-    } else {
-        result = (ptr_t)sbrk(GC_page_size + (SBRK_ARG_T)bytes);
-        if (result == (caddr_t)(-1)) return(0);
-    }
-    my_brk_val = result + bytes + GC_page_size;	/* Always page aligned */
-    return((ptr_t)result);
-}
-
-#else  /* Not RS6000 */
-
-#if defined(USE_MMAP) || defined(USE_MUNMAP)
-
-#ifdef USE_MMAP_FIXED
-#   define GC_MMAP_FLAGS MAP_FIXED | MAP_PRIVATE
-	/* Seems to yield better performance on Solaris 2, but can	*/
-	/* be unreliable if something is already mapped at the address.	*/
-#else
-#   define GC_MMAP_FLAGS MAP_PRIVATE
-#endif
-
-#ifdef USE_MMAP_ANON
-# define zero_fd -1
-# if defined(MAP_ANONYMOUS)
-#   define OPT_MAP_ANON MAP_ANONYMOUS
-# else
-#   define OPT_MAP_ANON MAP_ANON
-# endif
-#else
-  static int zero_fd;
-# define OPT_MAP_ANON 0
-#endif 
-
-#endif /* defined(USE_MMAP) || defined(USE_MUNMAP) */
-
-#if defined(USE_MMAP)
-/* Tested only under Linux, IRIX5 and Solaris 2 */
-
-#ifndef HEAP_START
-#   define HEAP_START 0
-#endif
-
-ptr_t GC_unix_get_mem(bytes)
-word bytes;
-{
-    void *result;
-    static ptr_t last_addr = HEAP_START;
-
-#   ifndef USE_MMAP_ANON
-      static GC_bool initialized = FALSE;
-
-      if (!initialized) {
-	  zero_fd = open("/dev/zero", O_RDONLY);
-	  fcntl(zero_fd, F_SETFD, FD_CLOEXEC);
-	  initialized = TRUE;
-      }
-#   endif
-
-    if (bytes & (GC_page_size -1)) ABORT("Bad GET_MEM arg");
-    result = mmap(last_addr, bytes, PROT_READ | PROT_WRITE | OPT_PROT_EXEC,
-		  GC_MMAP_FLAGS | OPT_MAP_ANON, zero_fd, 0/* offset */);
-    if (result == MAP_FAILED) return(0);
-    last_addr = (ptr_t)result + bytes + GC_page_size - 1;
-    last_addr = (ptr_t)((word)last_addr & ~(GC_page_size - 1));
-#   if !defined(LINUX)
-      if (last_addr == 0) {
-        /* Oops.  We got the end of the address space.  This isn't	*/
-	/* usable by arbitrary C code, since one-past-end pointers	*/
-	/* don't work, so we discard it and try again.			*/
-	munmap(result, (size_t)(-GC_page_size) - (size_t)result);
-			/* Leave last page mapped, so we can't repeat. */
-	return GC_unix_get_mem(bytes);
-      }
-#   else
-      GC_ASSERT(last_addr != 0);
-#   endif
-    return((ptr_t)result);
-}
-
-#else /* Not RS6000, not USE_MMAP */
-ptr_t GC_unix_get_mem(bytes)
-word bytes;
-{
-  ptr_t result;
-# ifdef IRIX5
-    /* Bare sbrk isn't thread safe.  Play by malloc rules.	*/
-    /* The equivalent may be needed on other systems as well. 	*/
-    __LOCK_MALLOC();
-# endif
-  {
-    ptr_t cur_brk = (ptr_t)sbrk(0);
-    SBRK_ARG_T lsbs = (word)cur_brk & (GC_page_size-1);
-    
-    if ((SBRK_ARG_T)bytes < 0) return(0); /* too big */
-    if (lsbs != 0) {
-        if((ptr_t)sbrk(GC_page_size - lsbs) == (ptr_t)(-1)) return(0);
-    }
-    result = (ptr_t)sbrk((SBRK_ARG_T)bytes);
-    if (result == (ptr_t)(-1)) result = 0;
-  }
-# ifdef IRIX5
-    __UNLOCK_MALLOC();
-# endif
-  return(result);
-}
-
-#endif /* Not USE_MMAP */
-#endif /* Not RS6000 */
-
-# endif /* UN*X */
-
-# ifdef OS2
-
-void * os2_alloc(size_t bytes)
-{
-    void * result;
-
-    if (DosAllocMem(&result, bytes, PAG_EXECUTE | PAG_READ |
-    				    PAG_WRITE | PAG_COMMIT)
-		    != NO_ERROR) {
-	return(0);
-    }
-    if (result == 0) return(os2_alloc(bytes));
-    return(result);
-}
-
-# endif /* OS2 */
-
-
-# if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-SYSTEM_INFO GC_sysinfo;
-# endif
-
-# if defined(MSWIN32) || defined(CYGWIN32)
-
-word GC_n_heap_bases = 0;
-
-# ifdef USE_GLOBAL_ALLOC
-#   define GLOBAL_ALLOC_TEST 1
-# else
-#   define GLOBAL_ALLOC_TEST GC_no_win32_dlls
-# endif
-
-ptr_t GC_win32_get_mem(bytes)
-word bytes;
-{
-    ptr_t result;
-
-# ifdef CYGWIN32
-    result = GC_unix_get_mem (bytes);
-# else
-    if (GLOBAL_ALLOC_TEST) {
-    	/* VirtualAlloc doesn't like PAGE_EXECUTE_READWRITE.	*/
-    	/* There are also unconfirmed rumors of other		*/
-    	/* problems, so we dodge the issue.			*/
-        result = (ptr_t) GlobalAlloc(0, bytes + HBLKSIZE);
-        result = (ptr_t)(((word)result + HBLKSIZE) & ~(HBLKSIZE-1));
-    } else {
-	/* VirtualProtect only works on regions returned by a	*/
-	/* single VirtualAlloc call.  Thus we allocate one 	*/
-	/* extra page, which will prevent merging of blocks	*/
-	/* in separate regions, and eliminate any temptation	*/
-	/* to call VirtualProtect on a range spanning regions.	*/
-	/* This wastes a small amount of memory, and risks	*/
-	/* increased fragmentation.  But better alternatives	*/
-	/* would require effort.				*/
-        result = (ptr_t) VirtualAlloc(NULL, bytes + 1,
-    				      MEM_COMMIT | MEM_RESERVE,
-    				      PAGE_EXECUTE_READWRITE);
-    }
-#endif
-    if (HBLKDISPL(result) != 0) ABORT("Bad VirtualAlloc result");
-    	/* If I read the documentation correctly, this can	*/
-    	/* only happen if HBLKSIZE > 64k or not a power of 2.	*/
-    if (GC_n_heap_bases >= MAX_HEAP_SECTS) ABORT("Too many heap sections");
-    GC_heap_bases[GC_n_heap_bases++] = result;
-    return(result);			  
-}
-
-void GC_win32_free_heap ()
-{
-    if (GC_no_win32_dlls) {
- 	while (GC_n_heap_bases > 0) {
-# ifdef CYGWIN32
- 	    free (GC_heap_bases[--GC_n_heap_bases]);
-# else
- 	    GlobalFree (GC_heap_bases[--GC_n_heap_bases]);
-# endif
- 	    GC_heap_bases[GC_n_heap_bases] = 0;
- 	}
-    }
-}
-# endif
-
-#ifdef AMIGA
-# define GC_AMIGA_AM
-# include "AmigaOS.c"
-# undef GC_AMIGA_AM
-#endif
-
-
-# ifdef MSWINCE
-word GC_n_heap_bases = 0;
-
-ptr_t GC_wince_get_mem(bytes)
-word bytes;
-{
-    ptr_t result;
-    word i;
-
-    /* Round up allocation size to multiple of page size */
-    bytes = (bytes + GC_page_size-1) & ~(GC_page_size-1);
-
-    /* Try to find reserved, uncommitted pages */
-    for (i = 0; i < GC_n_heap_bases; i++) {
-	if (((word)(-(signed_word)GC_heap_lengths[i])
-	     & (GC_sysinfo.dwAllocationGranularity-1))
-	    >= bytes) {
-	    result = GC_heap_bases[i] + GC_heap_lengths[i];
-	    break;
-	}
-    }
-
-    if (i == GC_n_heap_bases) {
-	/* Reserve more pages */
-	word res_bytes = (bytes + GC_sysinfo.dwAllocationGranularity-1)
-			 & ~(GC_sysinfo.dwAllocationGranularity-1);
-	/* If we ever support MPROTECT_VDB here, we will probably need to	*/
-	/* ensure that res_bytes is strictly > bytes, so that VirtualProtect	*/
-	/* never spans regions.  It seems to be OK for a VirtualFree argument	*/
-	/* to span regions, so we should be OK for now.				*/
-	result = (ptr_t) VirtualAlloc(NULL, res_bytes,
-    				      MEM_RESERVE | MEM_TOP_DOWN,
-    				      PAGE_EXECUTE_READWRITE);
-	if (HBLKDISPL(result) != 0) ABORT("Bad VirtualAlloc result");
-    	    /* If I read the documentation correctly, this can	*/
-    	    /* only happen if HBLKSIZE > 64k or not a power of 2.	*/
-	if (GC_n_heap_bases >= MAX_HEAP_SECTS) ABORT("Too many heap sections");
-	GC_heap_bases[GC_n_heap_bases] = result;
-	GC_heap_lengths[GC_n_heap_bases] = 0;
-	GC_n_heap_bases++;
-    }
-
-    /* Commit pages */
-    result = (ptr_t) VirtualAlloc(result, bytes,
-				  MEM_COMMIT,
-    				  PAGE_EXECUTE_READWRITE);
-    if (result != NULL) {
-	if (HBLKDISPL(result) != 0) ABORT("Bad VirtualAlloc result");
-	GC_heap_lengths[i] += bytes;
-    }
-
-    return(result);			  
-}
-# endif
-
-#ifdef USE_MUNMAP
-
-/* For now, this only works on Win32/WinCE and some Unix-like	*/
-/* systems.  If you have something else, don't define		*/
-/* USE_MUNMAP.							*/
-/* We assume ANSI C to support this feature.			*/
-
-#if !defined(MSWIN32) && !defined(MSWINCE)
-
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#endif
-
-/* Compute a page aligned starting address for the unmap 	*/
-/* operation on a block of size bytes starting at start.	*/
-/* Return 0 if the block is too small to make this feasible.	*/
-ptr_t GC_unmap_start(ptr_t start, word bytes)
-{
-    ptr_t result = start;
-    /* Round start to next page boundary.       */
-        result += GC_page_size - 1;
-        result = (ptr_t)((word)result & ~(GC_page_size - 1));
-    if (result + GC_page_size > start + bytes) return 0;
-    return result;
-}
-
-/* Compute end address for an unmap operation on the indicated	*/
-/* block.							*/
-ptr_t GC_unmap_end(ptr_t start, word bytes)
-{
-    ptr_t end_addr = start + bytes;
-    end_addr = (ptr_t)((word)end_addr & ~(GC_page_size - 1));
-    return end_addr;
-}
-
-/* Under Win32/WinCE we commit (map) and decommit (unmap)	*/
-/* memory using	VirtualAlloc and VirtualFree.  These functions	*/
-/* work on individual allocations of virtual memory, made	*/
-/* previously using VirtualAlloc with the MEM_RESERVE flag.	*/
-/* The ranges we need to (de)commit may span several of these	*/
-/* allocations; therefore we use VirtualQuery to check		*/
-/* allocation lengths, and split up the range as necessary.	*/
-
-/* We assume that GC_remap is called on exactly the same range	*/
-/* as a previous call to GC_unmap.  It is safe to consistently	*/
-/* round the endpoints in both places.				*/
-void GC_unmap(ptr_t start, word bytes)
-{
-    ptr_t start_addr = GC_unmap_start(start, bytes);
-    ptr_t end_addr = GC_unmap_end(start, bytes);
-    word len = end_addr - start_addr;
-    if (0 == start_addr) return;
-#   if defined(MSWIN32) || defined(MSWINCE)
-      while (len != 0) {
-          MEMORY_BASIC_INFORMATION mem_info;
-	  GC_word free_len;
-	  if (VirtualQuery(start_addr, &mem_info, sizeof(mem_info))
-	      != sizeof(mem_info))
-	      ABORT("Weird VirtualQuery result");
-	  free_len = (len < mem_info.RegionSize) ? len : mem_info.RegionSize;
-	  if (!VirtualFree(start_addr, free_len, MEM_DECOMMIT))
-	      ABORT("VirtualFree failed");
-	  GC_unmapped_bytes += free_len;
-	  start_addr += free_len;
-	  len -= free_len;
-      }
-#   else
-      /* We immediately remap it to prevent an intervening mmap from	*/
-      /* accidentally grabbing the same address space.			*/
-      {
-	void * result;
-        result = mmap(start_addr, len, PROT_NONE,
-		      MAP_PRIVATE | MAP_FIXED | OPT_MAP_ANON,
-		      zero_fd, 0/* offset */);
-        if (result != (void *)start_addr) ABORT("mmap(...PROT_NONE...) failed");
-      }
-      GC_unmapped_bytes += len;
-#   endif
-}
-
-
-void GC_remap(ptr_t start, word bytes)
-{
-    ptr_t start_addr = GC_unmap_start(start, bytes);
-    ptr_t end_addr = GC_unmap_end(start, bytes);
-    word len = end_addr - start_addr;
-
-#   if defined(MSWIN32) || defined(MSWINCE)
-      ptr_t result;
-
-      if (0 == start_addr) return;
-      while (len != 0) {
-          MEMORY_BASIC_INFORMATION mem_info;
-	  GC_word alloc_len;
-	  if (VirtualQuery(start_addr, &mem_info, sizeof(mem_info))
-	      != sizeof(mem_info))
-	      ABORT("Weird VirtualQuery result");
-	  alloc_len = (len < mem_info.RegionSize) ? len : mem_info.RegionSize;
-	  result = VirtualAlloc(start_addr, alloc_len,
-				MEM_COMMIT,
-				PAGE_EXECUTE_READWRITE);
-	  if (result != start_addr) {
-	      ABORT("VirtualAlloc remapping failed");
-	  }
-	  GC_unmapped_bytes -= alloc_len;
-	  start_addr += alloc_len;
-	  len -= alloc_len;
-      }
-#   else
-      /* It was already remapped with PROT_NONE. */
-      int result; 
-
-      if (0 == start_addr) return;
-      result = mprotect(start_addr, len,
-		        PROT_READ | PROT_WRITE | OPT_PROT_EXEC);
-      if (result != 0) {
-	  GC_err_printf3(
-		"Mprotect failed at 0x%lx (length %ld) with errno %ld\n",
-	        start_addr, len, errno);
-	  ABORT("Mprotect remapping failed");
-      }
-      GC_unmapped_bytes -= len;
-#   endif
-}
-
-/* Two adjacent blocks have already been unmapped and are about to	*/
-/* be merged.  Unmap the whole block.  This typically requires		*/
-/* that we unmap a small section in the middle that was not previously	*/
-/* unmapped due to alignment constraints.				*/
-void GC_unmap_gap(ptr_t start1, word bytes1, ptr_t start2, word bytes2)
-{
-    ptr_t start1_addr = GC_unmap_start(start1, bytes1);
-    ptr_t end1_addr = GC_unmap_end(start1, bytes1);
-    ptr_t start2_addr = GC_unmap_start(start2, bytes2);
-    ptr_t end2_addr = GC_unmap_end(start2, bytes2);
-    ptr_t start_addr = end1_addr;
-    ptr_t end_addr = start2_addr;
-    word len;
-    GC_ASSERT(start1 + bytes1 == start2);
-    if (0 == start1_addr) start_addr = GC_unmap_start(start1, bytes1 + bytes2);
-    if (0 == start2_addr) end_addr = GC_unmap_end(start1, bytes1 + bytes2);
-    if (0 == start_addr) return;
-    len = end_addr - start_addr;
-#   if defined(MSWIN32) || defined(MSWINCE)
-      while (len != 0) {
-          MEMORY_BASIC_INFORMATION mem_info;
-	  GC_word free_len;
-	  if (VirtualQuery(start_addr, &mem_info, sizeof(mem_info))
-	      != sizeof(mem_info))
-	      ABORT("Weird VirtualQuery result");
-	  free_len = (len < mem_info.RegionSize) ? len : mem_info.RegionSize;
-	  if (!VirtualFree(start_addr, free_len, MEM_DECOMMIT))
-	      ABORT("VirtualFree failed");
-	  GC_unmapped_bytes += free_len;
-	  start_addr += free_len;
-	  len -= free_len;
-      }
-#   else
-      if (len != 0 && munmap(start_addr, len) != 0) ABORT("munmap failed");
-      GC_unmapped_bytes += len;
-#   endif
-}
-
-#endif /* USE_MUNMAP */
-
-/* Routine for pushing any additional roots.  In THREADS 	*/
-/* environment, this is also responsible for marking from 	*/
-/* thread stacks. 						*/
-#ifndef THREADS
-void (*GC_push_other_roots)() = 0;
-#else /* THREADS */
-
-# ifdef PCR
-PCR_ERes GC_push_thread_stack(PCR_Th_T *t, PCR_Any dummy)
-{
-    struct PCR_ThCtl_TInfoRep info;
-    PCR_ERes result;
-    
-    info.ti_stkLow = info.ti_stkHi = 0;
-    result = PCR_ThCtl_GetInfo(t, &info);
-    GC_push_all_stack((ptr_t)(info.ti_stkLow), (ptr_t)(info.ti_stkHi));
-    return(result);
-}
-
-/* Push the contents of an old object. We treat this as stack	*/
-/* data only becasue that makes it robust against mark stack	*/
-/* overflow.							*/
-PCR_ERes GC_push_old_obj(void *p, size_t size, PCR_Any data)
-{
-    GC_push_all_stack((ptr_t)p, (ptr_t)p + size);
-    return(PCR_ERes_okay);
-}
-
-
-void GC_default_push_other_roots GC_PROTO((void))
-{
-    /* Traverse data allocated by previous memory managers.		*/
-	{
-	  extern struct PCR_MM_ProcsRep * GC_old_allocator;
-	  
-	  if ((*(GC_old_allocator->mmp_enumerate))(PCR_Bool_false,
-	  					   GC_push_old_obj, 0)
-	      != PCR_ERes_okay) {
-	      ABORT("Old object enumeration failed");
-	  }
-	}
-    /* Traverse all thread stacks. */
-	if (PCR_ERes_IsErr(
-                PCR_ThCtl_ApplyToAllOtherThreads(GC_push_thread_stack,0))
-              || PCR_ERes_IsErr(GC_push_thread_stack(PCR_Th_CurrThread(), 0))) {
-              ABORT("Thread stack marking failed\n");
-	}
-}
-
-# endif /* PCR */
-
-# ifdef SRC_M3
-
-# ifdef ALL_INTERIOR_POINTERS
-    --> misconfigured
-# endif
-
-void GC_push_thread_structures GC_PROTO((void))
-{
-    /* Not our responsibibility. */
-}
-
-extern void ThreadF__ProcessStacks();
-
-void GC_push_thread_stack(start, stop)
-word start, stop;
-{
-   GC_push_all_stack((ptr_t)start, (ptr_t)stop + sizeof(word));
-}
-
-/* Push routine with M3 specific calling convention. */
-GC_m3_push_root(dummy1, p, dummy2, dummy3)
-word *p;
-ptr_t dummy1, dummy2;
-int dummy3;
-{
-    word q = *p;
-    
-    GC_PUSH_ONE_STACK(q, p);
-}
-
-/* M3 set equivalent to RTHeap.TracedRefTypes */
-typedef struct { int elts[1]; }  RefTypeSet;
-RefTypeSet GC_TracedRefTypes = {{0x1}};
-
-void GC_default_push_other_roots GC_PROTO((void))
-{
-    /* Use the M3 provided routine for finding static roots.	 */
-    /* This is a bit dubious, since it presumes no C roots.	 */
-    /* We handle the collector roots explicitly in GC_push_roots */
-      	RTMain__GlobalMapProc(GC_m3_push_root, 0, GC_TracedRefTypes);
-	if (GC_words_allocd > 0) {
-	    ThreadF__ProcessStacks(GC_push_thread_stack);
-	}
-	/* Otherwise this isn't absolutely necessary, and we have	*/
-	/* startup ordering problems.					*/
-}
-
-# endif /* SRC_M3 */
-
-# if defined(GC_SOLARIS_THREADS) || defined(GC_PTHREADS) || \
-     defined(GC_WIN32_THREADS)
-
-extern void GC_push_all_stacks();
-
-void GC_default_push_other_roots GC_PROTO((void))
-{
-    GC_push_all_stacks();
-}
-
-# endif /* GC_SOLARIS_THREADS || GC_PTHREADS */
-
-void (*GC_push_other_roots) GC_PROTO((void)) = GC_default_push_other_roots;
-
-#endif /* THREADS */
-
-/*
- * Routines for accessing dirty  bits on virtual pages.
- * We plan to eventually implement four strategies for doing so:
- * DEFAULT_VDB:	A simple dummy implementation that treats every page
- *		as possibly dirty.  This makes incremental collection
- *		useless, but the implementation is still correct.
- * PCR_VDB:	Use PPCRs virtual dirty bit facility.
- * PROC_VDB:	Use the /proc facility for reading dirty bits.  Only
- *		works under some SVR4 variants.  Even then, it may be
- *		too slow to be entirely satisfactory.  Requires reading
- *		dirty bits for entire address space.  Implementations tend
- *		to assume that the client is a (slow) debugger.
- * MPROTECT_VDB:Protect pages and then catch the faults to keep track of
- *		dirtied pages.  The implementation (and implementability)
- *		is highly system dependent.  This usually fails when system
- *		calls write to a protected page.  We prevent the read system
- *		call from doing so.  It is the clients responsibility to
- *		make sure that other system calls are similarly protected
- *		or write only to the stack.
- */
-GC_bool GC_dirty_maintained = FALSE;
-
-# ifdef DEFAULT_VDB
-
-/* All of the following assume the allocation lock is held, and	*/
-/* signals are disabled.					*/
-
-/* The client asserts that unallocated pages in the heap are never	*/
-/* written.								*/
-
-/* Initialize virtual dirty bit implementation.			*/
-void GC_dirty_init()
-{
-#   ifdef PRINTSTATS
-      GC_printf0("Initializing DEFAULT_VDB...\n");
-#   endif
-    GC_dirty_maintained = TRUE;
-}
-
-/* Retrieve system dirty bits for heap to a local buffer.	*/
-/* Restore the systems notion of which pages are dirty.		*/
-void GC_read_dirty()
-{}
-
-/* Is the HBLKSIZE sized page at h marked dirty in the local buffer?	*/
-/* If the actual page size is different, this returns TRUE if any	*/
-/* of the pages overlapping h are dirty.  This routine may err on the	*/
-/* side of labelling pages as dirty (and this implementation does).	*/
-/*ARGSUSED*/
-GC_bool GC_page_was_dirty(h)
-struct hblk *h;
-{
-    return(TRUE);
-}
-
-/*
- * The following two routines are typically less crucial.  They matter
- * most with large dynamic libraries, or if we can't accurately identify
- * stacks, e.g. under Solaris 2.X.  Otherwise the following default
- * versions are adequate.
- */
- 
-/* Could any valid GC heap pointer ever have been written to this page?	*/
-/*ARGSUSED*/
-GC_bool GC_page_was_ever_dirty(h)
-struct hblk *h;
-{
-    return(TRUE);
-}
-
-/* Reset the n pages starting at h to "was never dirty" status.	*/
-void GC_is_fresh(h, n)
-struct hblk *h;
-word n;
-{
-}
-
-/* A call that:						*/
-/* I) hints that [h, h+nblocks) is about to be written.	*/
-/* II) guarantees that protection is removed.		*/
-/* (I) may speed up some dirty bit implementations.	*/
-/* (II) may be essential if we need to ensure that	*/
-/* pointer-free system call buffers in the heap are 	*/
-/* not protected.					*/
-/*ARGSUSED*/
-void GC_remove_protection(h, nblocks, is_ptrfree)
-struct hblk *h;
-word nblocks;
-GC_bool is_ptrfree;
-{
-}
-
-# endif /* DEFAULT_VDB */
-
-
-# ifdef MPROTECT_VDB
-
-/*
- * See DEFAULT_VDB for interface descriptions.
- */
-
-/*
- * This implementation maintains dirty bits itself by catching write
- * faults and keeping track of them.  We assume nobody else catches
- * SIGBUS or SIGSEGV.  We assume no write faults occur in system calls.
- * This means that clients must ensure that system calls don't write
- * to the write-protected heap.  Probably the best way to do this is to
- * ensure that system calls write at most to POINTERFREE objects in the
- * heap, and do even that only if we are on a platform on which those
- * are not protected.  Another alternative is to wrap system calls
- * (see example for read below), but the current implementation holds
- * a lock across blocking calls, making it problematic for multithreaded
- * applications. 
- * We assume the page size is a multiple of HBLKSIZE.
- * We prefer them to be the same.  We avoid protecting POINTERFREE
- * objects only if they are the same.
- */
-
-# if !defined(MSWIN32) && !defined(MSWINCE) && !defined(DARWIN)
-
-#   include <sys/mman.h>
-#   include <signal.h>
-#   include <sys/syscall.h>
-
-#   define PROTECT(addr, len) \
-    	  if (mprotect((caddr_t)(addr), (size_t)(len), \
-    	      	       PROT_READ | OPT_PROT_EXEC) < 0) { \
-    	    ABORT("mprotect failed"); \
-    	  }
-#   define UNPROTECT(addr, len) \
-    	  if (mprotect((caddr_t)(addr), (size_t)(len), \
-    	  	       PROT_WRITE | PROT_READ | OPT_PROT_EXEC ) < 0) { \
-    	    ABORT("un-mprotect failed"); \
-    	  }
-    	  
-# else
-
-# ifdef DARWIN
-    /* Using vm_protect (mach syscall) over mprotect (BSD syscall) seems to
-       decrease the likelihood of some of the problems described below. */
-    #include <mach/vm_map.h>
-    static mach_port_t GC_task_self;
-    #define PROTECT(addr,len) \
-        if(vm_protect(GC_task_self,(vm_address_t)(addr),(vm_size_t)(len), \
-                FALSE,VM_PROT_READ) != KERN_SUCCESS) { \
-            ABORT("vm_portect failed"); \
-        }
-    #define UNPROTECT(addr,len) \
-        if(vm_protect(GC_task_self,(vm_address_t)(addr),(vm_size_t)(len), \
-                FALSE,VM_PROT_READ|VM_PROT_WRITE) != KERN_SUCCESS) { \
-            ABORT("vm_portect failed"); \
-        }
-# else
-    
-#   ifndef MSWINCE
-#     include <signal.h>
-#   endif
-
-    static DWORD protect_junk;
-#   define PROTECT(addr, len) \
-	  if (!VirtualProtect((addr), (len), PAGE_EXECUTE_READ, \
-	  		      &protect_junk)) { \
-	    DWORD last_error = GetLastError(); \
-	    GC_printf1("Last error code: %lx\n", last_error); \
-	    ABORT("VirtualProtect failed"); \
-	  }
-#   define UNPROTECT(addr, len) \
-	  if (!VirtualProtect((addr), (len), PAGE_EXECUTE_READWRITE, \
-	  		      &protect_junk)) { \
-	    ABORT("un-VirtualProtect failed"); \
-	  }
-# endif /* !DARWIN */
-# endif /* MSWIN32 || MSWINCE || DARWIN */
-
-#if defined(SUNOS4) || (defined(FREEBSD) && !defined(SUNOS5SIGS))
-    typedef void (* SIG_PF)();
-#endif /* SUNOS4 || (FREEBSD && !SUNOS5SIGS) */
-
-#if defined(SUNOS5SIGS) || defined(OSF1) || defined(LINUX) \
-    || defined(HURD)
-# ifdef __STDC__
-    typedef void (* SIG_PF)(int);
-# else
-    typedef void (* SIG_PF)();
-# endif
-#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD */
-
-#if defined(MSWIN32)
-    typedef LPTOP_LEVEL_EXCEPTION_FILTER SIG_PF;
-#   undef SIG_DFL
-#   define SIG_DFL (LPTOP_LEVEL_EXCEPTION_FILTER) (-1)
-#endif
-#if defined(MSWINCE)
-    typedef LONG (WINAPI *SIG_PF)(struct _EXCEPTION_POINTERS *);
-#   undef SIG_DFL
-#   define SIG_DFL (SIG_PF) (-1)
-#endif
-
-#if defined(IRIX5) || defined(OSF1) || defined(HURD)
-    typedef void (* REAL_SIG_PF)(int, int, struct sigcontext *);
-#endif /* IRIX5 || OSF1 || HURD */
-
-#if defined(SUNOS5SIGS)
-# if defined(HPUX) || defined(FREEBSD)
-#   define SIGINFO_T siginfo_t
-# else
-#   define SIGINFO_T struct siginfo
-# endif
-# ifdef __STDC__
-    typedef void (* REAL_SIG_PF)(int, SIGINFO_T *, void *);
-# else
-    typedef void (* REAL_SIG_PF)();
-# endif
-#endif /* SUNOS5SIGS */
-
-#if defined(LINUX)
-#   if __GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
-      typedef struct sigcontext s_c;
-#   else  /* glibc < 2.2 */
-#     include <linux/version.h>
-#     if (LINUX_VERSION_CODE >= 0x20100) && !defined(M68K) || defined(ALPHA) || defined(ARM32)
-        typedef struct sigcontext s_c;
-#     else
-        typedef struct sigcontext_struct s_c;
-#     endif
-#   endif  /* glibc < 2.2 */
-#   if defined(ALPHA) || defined(M68K)
-      typedef void (* REAL_SIG_PF)(int, int, s_c *);
-#   else
-#     if defined(IA64) || defined(HP_PA) || defined(X86_64)
-        typedef void (* REAL_SIG_PF)(int, siginfo_t *, s_c *);
-	/* FIXME:						  */
-	/* According to SUSV3, the last argument should have type */
-	/* void * or ucontext_t *				  */
-#     else
-        typedef void (* REAL_SIG_PF)(int, s_c);
-#     endif
-#   endif
-#   ifdef ALPHA
-    /* Retrieve fault address from sigcontext structure by decoding	*/
-    /* instruction.							*/
-    char * get_fault_addr(s_c *sc) {
-        unsigned instr;
-	word faultaddr;
-
-	instr = *((unsigned *)(sc->sc_pc));
-	faultaddr = sc->sc_regs[(instr >> 16) & 0x1f];
-	faultaddr += (word) (((int)instr << 16) >> 16);
-	return (char *)faultaddr;
-    }
-#   endif /* !ALPHA */
-# endif /* LINUX */
-
-#ifndef DARWIN
-SIG_PF GC_old_bus_handler;
-SIG_PF GC_old_segv_handler;	/* Also old MSWIN32 ACCESS_VIOLATION filter */
-#endif /* !DARWIN */
-
-#if defined(THREADS)
-/* We need to lock around the bitmap update in the write fault handler	*/
-/* in order to avoid the risk of losing a bit.  We do this with a 	*/
-/* test-and-set spin lock if we know how to do that.  Otherwise we	*/
-/* check whether we are already in the handler and use the dumb but	*/
-/* safe fallback algorithm of setting all bits in the word.		*/
-/* Contention should be very rare, so we do the minimum to handle it	*/
-/* correctly.								*/
-#ifdef GC_TEST_AND_SET_DEFINED
-  static VOLATILE unsigned int fault_handler_lock = 0;
-  void async_set_pht_entry_from_index(VOLATILE page_hash_table db, int index) {
-    while (GC_test_and_set(&fault_handler_lock)) {}
-    /* Could also revert to set_pht_entry_from_index_safe if initial	*/
-    /* GC_test_and_set fails.						*/
-    set_pht_entry_from_index(db, index);
-    GC_clear(&fault_handler_lock);
-  }
-#else /* !GC_TEST_AND_SET_DEFINED */
-  /* THIS IS INCORRECT! The dirty bit vector may be temporarily wrong,	*/
-  /* just before we notice the conflict and correct it. We may end up   */
-  /* looking at it while it's wrong.  But this requires contention	*/
-  /* exactly when a GC is triggered, which seems far less likely to	*/
-  /* fail than the old code, which had no reported failures.  Thus we	*/
-  /* leave it this way while we think of something better, or support	*/
-  /* GC_test_and_set on the remaining platforms.			*/
-  static VOLATILE word currently_updating = 0;
-  void async_set_pht_entry_from_index(VOLATILE page_hash_table db, int index) {
-    unsigned int update_dummy;
-    currently_updating = (word)(&update_dummy);
-    set_pht_entry_from_index(db, index);
-    /* If we get contention in the 10 or so instruction window here,	*/
-    /* and we get stopped by a GC between the two updates, we lose!	*/
-    if (currently_updating != (word)(&update_dummy)) {
-	set_pht_entry_from_index_safe(db, index);
-	/* We claim that if two threads concurrently try to update the	*/
-	/* dirty bit vector, the first one to execute UPDATE_START 	*/
-	/* will see it changed when UPDATE_END is executed.  (Note that	*/
-	/* &update_dummy must differ in two distinct threads.)  It	*/
-	/* will then execute set_pht_entry_from_index_safe, thus 	*/
-	/* returning us to a safe state, though not soon enough.	*/
-    }
-  }
-#endif /* !GC_TEST_AND_SET_DEFINED */
-#else /* !THREADS */
-# define async_set_pht_entry_from_index(db, index) \
-	set_pht_entry_from_index(db, index)
-#endif /* !THREADS */
-
-/*ARGSUSED*/
-#if !defined(DARWIN)
-# if defined (SUNOS4) || (defined(FREEBSD) && !defined(SUNOS5SIGS))
-    void GC_write_fault_handler(sig, code, scp, addr)
-    int sig, code;
-    struct sigcontext *scp;
-    char * addr;
-#   ifdef SUNOS4
-#     define SIG_OK (sig == SIGSEGV || sig == SIGBUS)
-#     define CODE_OK (FC_CODE(code) == FC_PROT \
-              	    || (FC_CODE(code) == FC_OBJERR \
-              	       && FC_ERRNO(code) == FC_PROT))
-#   endif
-#   ifdef FREEBSD
-#     define SIG_OK (sig == SIGBUS)
-#     define CODE_OK TRUE
-#   endif
-# endif /* SUNOS4 || (FREEBSD && !SUNOS5SIGS) */
-
-# if defined(IRIX5) || defined(OSF1) || defined(HURD)
-#   include <errno.h>
-    void GC_write_fault_handler(int sig, int code, struct sigcontext *scp)
-#   ifdef OSF1
-#     define SIG_OK (sig == SIGSEGV)
-#     define CODE_OK (code == 2 /* experimentally determined */)
-#   endif
-#   ifdef IRIX5
-#     define SIG_OK (sig == SIGSEGV)
-#     define CODE_OK (code == EACCES)
-#   endif
-#   ifdef HURD
-#     define SIG_OK (sig == SIGBUS || sig == SIGSEGV) 	
-#     define CODE_OK  TRUE
-#   endif
-# endif /* IRIX5 || OSF1 || HURD */
-
-# if defined(LINUX)
-#   if defined(ALPHA) || defined(M68K)
-      void GC_write_fault_handler(int sig, int code, s_c * sc)
-#   else
-#     if defined(IA64) || defined(HP_PA) || defined(X86_64)
-        void GC_write_fault_handler(int sig, siginfo_t * si, s_c * scp)
-#     else
-#       if defined(ARM32)
-          void GC_write_fault_handler(int sig, int a2, int a3, int a4, s_c sc)
-#       else
-          void GC_write_fault_handler(int sig, s_c sc)
-#       endif
-#     endif
-#   endif
-#   define SIG_OK (sig == SIGSEGV)
-#   define CODE_OK TRUE
-	/* Empirically c.trapno == 14, on IA32, but is that useful?     */
-	/* Should probably consider alignment issues on other 		*/
-	/* architectures.						*/
-# endif /* LINUX */
-
-# if defined(SUNOS5SIGS)
-#  ifdef __STDC__
-    void GC_write_fault_handler(int sig, SIGINFO_T *scp, void * context)
-#  else
-    void GC_write_fault_handler(sig, scp, context)
-    int sig;
-    SIGINFO_T *scp;
-    void * context;
-#  endif
-#   ifdef HPUX
-#     define SIG_OK (sig == SIGSEGV || sig == SIGBUS)
-#     define CODE_OK (scp -> si_code == SEGV_ACCERR) \
-		     || (scp -> si_code == BUS_ADRERR) \
-		     || (scp -> si_code == BUS_UNKNOWN) \
-		     || (scp -> si_code == SEGV_UNKNOWN) \
-		     || (scp -> si_code == BUS_OBJERR)
-#   else
-#     ifdef FREEBSD
-#       define SIG_OK (sig == SIGBUS)
-#       define CODE_OK (scp -> si_code == BUS_PAGE_FAULT)
-#     else
-#       define SIG_OK (sig == SIGSEGV)
-#       define CODE_OK (scp -> si_code == SEGV_ACCERR)
-#     endif
-#   endif    
-# endif /* SUNOS5SIGS */
-
-# if defined(MSWIN32) || defined(MSWINCE)
-    LONG WINAPI GC_write_fault_handler(struct _EXCEPTION_POINTERS *exc_info)
-#   define SIG_OK (exc_info -> ExceptionRecord -> ExceptionCode == \
-			STATUS_ACCESS_VIOLATION)
-#   define CODE_OK (exc_info -> ExceptionRecord -> ExceptionInformation[0] == 1)
-			/* Write fault */
-# endif /* MSWIN32 || MSWINCE */
-{
-    register unsigned i;
-#   if defined(HURD) 
-	char *addr = (char *) code;
-#   endif
-#   ifdef IRIX5
-	char * addr = (char *) (size_t) (scp -> sc_badvaddr);
-#   endif
-#   if defined(OSF1) && defined(ALPHA)
-	char * addr = (char *) (scp -> sc_traparg_a0);
-#   endif
-#   ifdef SUNOS5SIGS
-	char * addr = (char *) (scp -> si_addr);
-#   endif
-#   ifdef LINUX
-#     if defined(I386)
-	char * addr = (char *) (sc.cr2);
-#     else
-#	if defined(M68K)
-          char * addr = NULL;
-
-	  struct sigcontext *scp = (struct sigcontext *)(sc);
-
-	  int format = (scp->sc_formatvec >> 12) & 0xf;
-	  unsigned long *framedata = (unsigned long *)(scp + 1); 
-	  unsigned long ea;
-
-	  if (format == 0xa || format == 0xb) {
-	  	/* 68020/030 */
-	  	ea = framedata[2];
-	  } else if (format == 7) {
-	  	/* 68040 */
-	  	ea = framedata[3];
-	  	if (framedata[1] & 0x08000000) {
-	  		/* correct addr on misaligned access */
-	  		ea = (ea+4095)&(~4095);
-		}
-	  } else if (format == 4) {
-	  	/* 68060 */
-	  	ea = framedata[0];
-	  	if (framedata[1] & 0x08000000) {
-	  		/* correct addr on misaligned access */
-	  		ea = (ea+4095)&(~4095);
-	  	}
-	  }	
-	  addr = (char *)ea;
-#	else
-#	  ifdef ALPHA
-            char * addr = get_fault_addr(sc);
-#	  else
-#	    if defined(IA64) || defined(HP_PA) || defined(X86_64)
-	      char * addr = si -> si_addr;
-	      /* I believe this is claimed to work on all platforms for	*/
-	      /* Linux 2.3.47 and later.  Hopefully we don't have to	*/
-	      /* worry about earlier kernels on IA64.			*/
-#	    else
-#             if defined(POWERPC)
-                char * addr = (char *) (sc.regs->dar);
-#	      else
-#               if defined(ARM32)
-                  char * addr = (char *)sc.fault_address;
-#               else
-#		  if defined(CRIS)
-		    char * addr = (char *)sc.regs.csraddr;
-#		  else
-		    --> architecture not supported
-#		  endif
-#               endif
-#	      endif
-#	    endif
-#	  endif
-#	endif
-#     endif
-#   endif
-#   if defined(MSWIN32) || defined(MSWINCE)
-	char * addr = (char *) (exc_info -> ExceptionRecord
-				-> ExceptionInformation[1]);
-#	define sig SIGSEGV
-#   endif
-    
-    if (SIG_OK && CODE_OK) {
-        register struct hblk * h =
-        		(struct hblk *)((word)addr & ~(GC_page_size-1));
-        GC_bool in_allocd_block;
-        
-#	ifdef SUNOS5SIGS
-	    /* Address is only within the correct physical page.	*/
-	    in_allocd_block = FALSE;
-            for (i = 0; i < divHBLKSZ(GC_page_size); i++) {
-              if (HDR(h+i) != 0) {
-                in_allocd_block = TRUE;
-              }
-            }
-#	else
-	    in_allocd_block = (HDR(addr) != 0);
-#	endif
-        if (!in_allocd_block) {
-	    /* FIXME - We should make sure that we invoke the	*/
-	    /* old handler with the appropriate calling 	*/
-	    /* sequence, which often depends on SA_SIGINFO.	*/
-
-	    /* Heap blocks now begin and end on page boundaries */
-            SIG_PF old_handler;
-            
-            if (sig == SIGSEGV) {
-            	old_handler = GC_old_segv_handler;
-            } else {
-                old_handler = GC_old_bus_handler;
-            }
-            if (old_handler == SIG_DFL) {
-#		if !defined(MSWIN32) && !defined(MSWINCE)
-		    GC_err_printf1("Segfault at 0x%lx\n", addr);
-                    ABORT("Unexpected bus error or segmentation fault");
-#		else
-		    return(EXCEPTION_CONTINUE_SEARCH);
-#		endif
-            } else {
-#		if defined (SUNOS4) \
-                    || (defined(FREEBSD) && !defined(SUNOS5SIGS))
-		    (*old_handler) (sig, code, scp, addr);
-		    return;
-#		endif
-#		if defined (SUNOS5SIGS)
-                    /*
-                     * FIXME: For FreeBSD, this code should check if the 
-                     * old signal handler used the traditional BSD style and
-                     * if so call it using that style.
-                     */
-		    (*(REAL_SIG_PF)old_handler) (sig, scp, context);
-		    return;
-#		endif
-#		if defined (LINUX)
-#		    if defined(ALPHA) || defined(M68K)
-		        (*(REAL_SIG_PF)old_handler) (sig, code, sc);
-#		    else 
-#		      if defined(IA64) || defined(HP_PA) || defined(X86_64)
-		        (*(REAL_SIG_PF)old_handler) (sig, si, scp);
-#		      else
-		        (*(REAL_SIG_PF)old_handler) (sig, sc);
-#		      endif
-#		    endif
-		    return;
-#		endif
-#		if defined (IRIX5) || defined(OSF1) || defined(HURD)
-		    (*(REAL_SIG_PF)old_handler) (sig, code, scp);
-		    return;
-#		endif
-#		ifdef MSWIN32
-		    return((*old_handler)(exc_info));
-#		endif
-            }
-        }
-        UNPROTECT(h, GC_page_size);
-	/* We need to make sure that no collection occurs between	*/
-	/* the UNPROTECT and the setting of the dirty bit.  Otherwise	*/
-	/* a write by a third thread might go unnoticed.  Reversing	*/
-	/* the order is just as bad, since we would end up unprotecting	*/
-	/* a page in a GC cycle during which it's not marked.		*/
-	/* Currently we do this by disabling the thread stopping	*/
-	/* signals while this handler is running.  An alternative might	*/
-	/* be to record the fact that we're about to unprotect, or	*/
-	/* have just unprotected a page in the GC's thread structure,	*/
-	/* and then to have the thread stopping code set the dirty	*/
-	/* flag, if necessary.						*/
-        for (i = 0; i < divHBLKSZ(GC_page_size); i++) {
-            register int index = PHT_HASH(h+i);
-            
-            async_set_pht_entry_from_index(GC_dirty_pages, index);
-        }
-#	if defined(OSF1)
-	    /* These reset the signal handler each time by default. */
-	    signal(SIGSEGV, (SIG_PF) GC_write_fault_handler);
-#	endif
-    	/* The write may not take place before dirty bits are read.	*/
-    	/* But then we'll fault again ...				*/
-#	if defined(MSWIN32) || defined(MSWINCE)
-	    return(EXCEPTION_CONTINUE_EXECUTION);
-#	else
-	    return;
-#	endif
-    }
-#if defined(MSWIN32) || defined(MSWINCE)
-    return EXCEPTION_CONTINUE_SEARCH;
-#else
-    GC_err_printf1("Segfault at 0x%lx\n", addr);
-    ABORT("Unexpected bus error or segmentation fault");
-#endif
-}
-#endif /* !DARWIN */
-
-/*
- * We hold the allocation lock.  We expect block h to be written
- * shortly.  Ensure that all pages containing any part of the n hblks
- * starting at h are no longer protected.  If is_ptrfree is false,
- * also ensure that they will subsequently appear to be dirty.
- */
-void GC_remove_protection(h, nblocks, is_ptrfree)
-struct hblk *h;
-word nblocks;
-GC_bool is_ptrfree;
-{
-    struct hblk * h_trunc;  /* Truncated to page boundary */
-    struct hblk * h_end;    /* Page boundary following block end */
-    struct hblk * current;
-    GC_bool found_clean;
-    
-    if (!GC_dirty_maintained) return;
-    h_trunc = (struct hblk *)((word)h & ~(GC_page_size-1));
-    h_end = (struct hblk *)(((word)(h + nblocks) + GC_page_size-1)
-	                    & ~(GC_page_size-1));
-    found_clean = FALSE;
-    for (current = h_trunc; current < h_end; ++current) {
-        int index = PHT_HASH(current);
-            
-        if (!is_ptrfree || current < h || current >= h + nblocks) {
-            async_set_pht_entry_from_index(GC_dirty_pages, index);
-        }
-    }
-    UNPROTECT(h_trunc, (ptr_t)h_end - (ptr_t)h_trunc);
-}
-
-#if !defined(DARWIN)
-void GC_dirty_init()
-{
-#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(LINUX) || \
-       defined(OSF1) || defined(HURD)
-      struct sigaction	act, oldact;
-      /* We should probably specify SA_SIGINFO for Linux, and handle 	*/
-      /* the different architectures more uniformly.			*/
-#     if defined(IRIX5) || defined(LINUX) && !defined(X86_64) \
-	 || defined(OSF1) || defined(HURD)
-    	act.sa_flags	= SA_RESTART;
-        act.sa_handler  = (SIG_PF)GC_write_fault_handler;
-#     else
-    	act.sa_flags	= SA_RESTART | SA_SIGINFO;
-        act.sa_sigaction = GC_write_fault_handler;
-#     endif
-      (void)sigemptyset(&act.sa_mask);
-#     ifdef SIG_SUSPEND
-        /* Arrange to postpone SIG_SUSPEND while we're in a write fault	*/
-        /* handler.  This effectively makes the handler atomic w.r.t.	*/
-        /* stopping the world for GC.					*/
-        (void)sigaddset(&act.sa_mask, SIG_SUSPEND);
-#     endif /* SIG_SUSPEND */
-#    endif
-#   ifdef PRINTSTATS
-	GC_printf0("Inititalizing mprotect virtual dirty bit implementation\n");
-#   endif
-    GC_dirty_maintained = TRUE;
-    if (GC_page_size % HBLKSIZE != 0) {
-        GC_err_printf0("Page size not multiple of HBLKSIZE\n");
-        ABORT("Page size not multiple of HBLKSIZE");
-    }
-#   if defined(SUNOS4) || (defined(FREEBSD) && !defined(SUNOS5SIGS))
-      GC_old_bus_handler = signal(SIGBUS, GC_write_fault_handler);
-      if (GC_old_bus_handler == SIG_IGN) {
-        GC_err_printf0("Previously ignored bus error!?");
-        GC_old_bus_handler = SIG_DFL;
-      }
-      if (GC_old_bus_handler != SIG_DFL) {
-#	ifdef PRINTSTATS
-          GC_err_printf0("Replaced other SIGBUS handler\n");
-#	endif
-      }
-#   endif
-#   if defined(SUNOS4)
-      GC_old_segv_handler = signal(SIGSEGV, (SIG_PF)GC_write_fault_handler);
-      if (GC_old_segv_handler == SIG_IGN) {
-        GC_err_printf0("Previously ignored segmentation violation!?");
-        GC_old_segv_handler = SIG_DFL;
-      }
-      if (GC_old_segv_handler != SIG_DFL) {
-#	ifdef PRINTSTATS
-          GC_err_printf0("Replaced other SIGSEGV handler\n");
-#	endif
-      }
-#   endif
-#   if (defined(SUNOS5SIGS) && !defined(FREEBSD)) || defined(IRIX5) \
-       || defined(LINUX) || defined(OSF1) || defined(HURD)
-      /* SUNOS5SIGS includes HPUX */
-#     if defined(GC_IRIX_THREADS)
-      	sigaction(SIGSEGV, 0, &oldact);
-      	sigaction(SIGSEGV, &act, 0);
-#     else 
-	{
-	  int res = sigaction(SIGSEGV, &act, &oldact);
-	  if (res != 0) ABORT("Sigaction failed");
- 	}
-#     endif
-#     if defined(_sigargs) || defined(HURD) || !defined(SA_SIGINFO)
-	/* This is Irix 5.x, not 6.x.  Irix 5.x does not have	*/
-	/* sa_sigaction.					*/
-	GC_old_segv_handler = oldact.sa_handler;
-#     else /* Irix 6.x or SUNOS5SIGS or LINUX */
-        if (oldact.sa_flags & SA_SIGINFO) {
-          GC_old_segv_handler = (SIG_PF)(oldact.sa_sigaction);
-        } else {
-          GC_old_segv_handler = oldact.sa_handler;
-        }
-#     endif
-      if (GC_old_segv_handler == SIG_IGN) {
-	     GC_err_printf0("Previously ignored segmentation violation!?");
-	     GC_old_segv_handler = SIG_DFL;
-      }
-      if (GC_old_segv_handler != SIG_DFL) {
-#       ifdef PRINTSTATS
-	  GC_err_printf0("Replaced other SIGSEGV handler\n");
-#       endif
-      }
-#   endif /* (SUNOS5SIGS && !FREEBSD) || IRIX5 || LINUX || OSF1 || HURD */
-#   if defined(HPUX) || defined(LINUX) || defined(HURD) \
-      || (defined(FREEBSD) && defined(SUNOS5SIGS))
-      sigaction(SIGBUS, &act, &oldact);
-      GC_old_bus_handler = oldact.sa_handler;
-      if (GC_old_bus_handler == SIG_IGN) {
-	     GC_err_printf0("Previously ignored bus error!?");
-	     GC_old_bus_handler = SIG_DFL;
-      }
-      if (GC_old_bus_handler != SIG_DFL) {
-#       ifdef PRINTSTATS
-	  GC_err_printf0("Replaced other SIGBUS handler\n");
-#       endif
-      }
-#   endif /* HPUX || LINUX || HURD || (FREEBSD && SUNOS5SIGS) */
-#   if defined(MSWIN32)
-      GC_old_segv_handler = SetUnhandledExceptionFilter(GC_write_fault_handler);
-      if (GC_old_segv_handler != NULL) {
-#	ifdef PRINTSTATS
-          GC_err_printf0("Replaced other UnhandledExceptionFilter\n");
-#	endif
-      } else {
-          GC_old_segv_handler = SIG_DFL;
-      }
-#   endif
-}
-#endif /* !DARWIN */
-
-int GC_incremental_protection_needs()
-{
-    if (GC_page_size == HBLKSIZE) {
-	return GC_PROTECTS_POINTER_HEAP;
-    } else {
-	return GC_PROTECTS_POINTER_HEAP | GC_PROTECTS_PTRFREE_HEAP;
-    }
-}
-
-#define HAVE_INCREMENTAL_PROTECTION_NEEDS
-
-#define IS_PTRFREE(hhdr) ((hhdr)->hb_descr == 0)
-
-#define PAGE_ALIGNED(x) !((word)(x) & (GC_page_size - 1))
-void GC_protect_heap()
-{
-    ptr_t start;
-    word len;
-    struct hblk * current;
-    struct hblk * current_start;  /* Start of block to be protected. */
-    struct hblk * limit;
-    unsigned i;
-    GC_bool protect_all = 
-	  (0 != (GC_incremental_protection_needs() & GC_PROTECTS_PTRFREE_HEAP));
-    for (i = 0; i < GC_n_heap_sects; i++) {
-        start = GC_heap_sects[i].hs_start;
-        len = GC_heap_sects[i].hs_bytes;
-	if (protect_all) {
-          PROTECT(start, len);
-	} else {
-	  GC_ASSERT(PAGE_ALIGNED(len))
-	  GC_ASSERT(PAGE_ALIGNED(start))
-	  current_start = current = (struct hblk *)start;
-	  limit = (struct hblk *)(start + len);
-	  while (current < limit) {
-            hdr * hhdr;
-	    word nhblks;
-	    GC_bool is_ptrfree;
-
-	    GC_ASSERT(PAGE_ALIGNED(current));
-	    GET_HDR(current, hhdr);
-	    if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-	      /* This can happen only if we're at the beginning of a 	*/
-	      /* heap segment, and a block spans heap segments.		*/
-	      /* We will handle that block as part of the preceding	*/
-	      /* segment.						*/
-	      GC_ASSERT(current_start == current);
-	      current_start = ++current;
-	      continue;
-	    }
-	    if (HBLK_IS_FREE(hhdr)) {
-	      GC_ASSERT(PAGE_ALIGNED(hhdr -> hb_sz));
-	      nhblks = divHBLKSZ(hhdr -> hb_sz);
-	      is_ptrfree = TRUE;	/* dirty on alloc */
-	    } else {
-	      nhblks = OBJ_SZ_TO_BLOCKS(hhdr -> hb_sz);
-	      is_ptrfree = IS_PTRFREE(hhdr);
-	    }
-	    if (is_ptrfree) {
-	      if (current_start < current) {
-		PROTECT(current_start, (ptr_t)current - (ptr_t)current_start);
-	      }
-	      current_start = (current += nhblks);
-	    } else {
-	      current += nhblks;
-	    }
-	  } 
-	  if (current_start < current) {
-	    PROTECT(current_start, (ptr_t)current - (ptr_t)current_start);
-	  }
-	}
-    }
-}
-
-/* We assume that either the world is stopped or its OK to lose dirty	*/
-/* bits while this is happenning (as in GC_enable_incremental).		*/
-void GC_read_dirty()
-{
-    BCOPY((word *)GC_dirty_pages, GC_grungy_pages,
-          (sizeof GC_dirty_pages));
-    BZERO((word *)GC_dirty_pages, (sizeof GC_dirty_pages));
-    GC_protect_heap();
-}
-
-GC_bool GC_page_was_dirty(h)
-struct hblk * h;
-{
-    register word index = PHT_HASH(h);
-    
-    return(HDR(h) == 0 || get_pht_entry_from_index(GC_grungy_pages, index));
-}
-
-/*
- * Acquiring the allocation lock here is dangerous, since this
- * can be called from within GC_call_with_alloc_lock, and the cord
- * package does so.  On systems that allow nested lock acquisition, this
- * happens to work.
- * On other systems, SET_LOCK_HOLDER and friends must be suitably defined.
- */
-
-static GC_bool syscall_acquired_lock = FALSE;	/* Protected by GC lock. */
- 
-void GC_begin_syscall()
-{
-    if (!I_HOLD_LOCK()) {
-	LOCK();
-	syscall_acquired_lock = TRUE;
-    }
-}
-
-void GC_end_syscall()
-{
-    if (syscall_acquired_lock) {
-	syscall_acquired_lock = FALSE;
-	UNLOCK();
-    }
-}
-
-void GC_unprotect_range(addr, len)
-ptr_t addr;
-word len;
-{
-    struct hblk * start_block;
-    struct hblk * end_block;
-    register struct hblk *h;
-    ptr_t obj_start;
-    
-    if (!GC_dirty_maintained) return;
-    obj_start = GC_base(addr);
-    if (obj_start == 0) return;
-    if (GC_base(addr + len - 1) != obj_start) {
-        ABORT("GC_unprotect_range(range bigger than object)");
-    }
-    start_block = (struct hblk *)((word)addr & ~(GC_page_size - 1));
-    end_block = (struct hblk *)((word)(addr + len - 1) & ~(GC_page_size - 1));
-    end_block += GC_page_size/HBLKSIZE - 1;
-    for (h = start_block; h <= end_block; h++) {
-        register word index = PHT_HASH(h);
-        
-        async_set_pht_entry_from_index(GC_dirty_pages, index);
-    }
-    UNPROTECT(start_block,
-    	      ((ptr_t)end_block - (ptr_t)start_block) + HBLKSIZE);
-}
-
-#if 0
-
-/* We no longer wrap read by default, since that was causing too many	*/
-/* problems.  It is preferred that the client instead avoids writing	*/
-/* to the write-protected heap with a system call.			*/
-/* This still serves as sample code if you do want to wrap system calls.*/
-
-#if !defined(MSWIN32) && !defined(MSWINCE) && !defined(GC_USE_LD_WRAP)
-/* Replacement for UNIX system call.					  */
-/* Other calls that write to the heap should be handled similarly.	  */
-/* Note that this doesn't work well for blocking reads:  It will hold	  */
-/* the allocation lock for the entire duration of the call. Multithreaded */
-/* clients should really ensure that it won't block, either by setting 	  */
-/* the descriptor nonblocking, or by calling select or poll first, to	  */
-/* make sure that input is available.					  */
-/* Another, preferred alternative is to ensure that system calls never 	  */
-/* write to the protected heap (see above).				  */
-# if defined(__STDC__) && !defined(SUNOS4)
-#   include <unistd.h>
-#   include <sys/uio.h>
-    ssize_t read(int fd, void *buf, size_t nbyte)
-# else
-#   ifndef LINT
-      int read(fd, buf, nbyte)
-#   else
-      int GC_read(fd, buf, nbyte)
-#   endif
-    int fd;
-    char *buf;
-    int nbyte;
-# endif
-{
-    int result;
-    
-    GC_begin_syscall();
-    GC_unprotect_range(buf, (word)nbyte);
-#   if defined(IRIX5) || defined(GC_LINUX_THREADS)
-	/* Indirect system call may not always be easily available.	*/
-	/* We could call _read, but that would interfere with the	*/
-	/* libpthread interception of read.				*/
-	/* On Linux, we have to be careful with the linuxthreads	*/
-	/* read interception.						*/
-	{
-	    struct iovec iov;
-
-	    iov.iov_base = buf;
-	    iov.iov_len = nbyte;
-	    result = readv(fd, &iov, 1);
-	}
-#   else
-#     if defined(HURD)	
-	result = __read(fd, buf, nbyte);
-#     else
- 	/* The two zero args at the end of this list are because one
- 	   IA-64 syscall() implementation actually requires six args
- 	   to be passed, even though they aren't always used. */
-     	result = syscall(SYS_read, fd, buf, nbyte, 0, 0);
-#     endif /* !HURD */
-#   endif
-    GC_end_syscall();
-    return(result);
-}
-#endif /* !MSWIN32 && !MSWINCE && !GC_LINUX_THREADS */
-
-#if defined(GC_USE_LD_WRAP) && !defined(THREADS)
-    /* We use the GNU ld call wrapping facility.			*/
-    /* This requires that the linker be invoked with "--wrap read".	*/
-    /* This can be done by passing -Wl,"--wrap read" to gcc.		*/
-    /* I'm not sure that this actually wraps whatever version of read	*/
-    /* is called by stdio.  That code also mentions __read.		*/
-#   include <unistd.h>
-    ssize_t __wrap_read(int fd, void *buf, size_t nbyte)
-    {
- 	int result;
-
-	GC_begin_syscall();
-    	GC_unprotect_range(buf, (word)nbyte);
-	result = __real_read(fd, buf, nbyte);
-	GC_end_syscall();
-	return(result);
-    }
-
-    /* We should probably also do this for __read, or whatever stdio	*/
-    /* actually calls.							*/
-#endif
-
-#endif /* 0 */
-
-/*ARGSUSED*/
-GC_bool GC_page_was_ever_dirty(h)
-struct hblk *h;
-{
-    return(TRUE);
-}
-
-/* Reset the n pages starting at h to "was never dirty" status.	*/
-/*ARGSUSED*/
-void GC_is_fresh(h, n)
-struct hblk *h;
-word n;
-{
-}
-
-# endif /* MPROTECT_VDB */
-
-# ifdef PROC_VDB
-
-/*
- * See DEFAULT_VDB for interface descriptions.
- */
- 
-/*
- * This implementaion assumes a Solaris 2.X like /proc pseudo-file-system
- * from which we can read page modified bits.  This facility is far from
- * optimal (e.g. we would like to get the info for only some of the
- * address space), but it avoids intercepting system calls.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/signal.h>
-#include <sys/fault.h>
-#include <sys/syscall.h>
-#include <sys/procfs.h>
-#include <sys/stat.h>
-
-#define INITIAL_BUF_SZ 16384
-word GC_proc_buf_size = INITIAL_BUF_SZ;
-char *GC_proc_buf;
-
-#ifdef GC_SOLARIS_THREADS
-/* We don't have exact sp values for threads.  So we count on	*/
-/* occasionally declaring stack pages to be fresh.  Thus we 	*/
-/* need a real implementation of GC_is_fresh.  We can't clear	*/
-/* entries in GC_written_pages, since that would declare all	*/
-/* pages with the given hash address to be fresh.		*/
-#   define MAX_FRESH_PAGES 8*1024	/* Must be power of 2 */
-    struct hblk ** GC_fresh_pages;	/* A direct mapped cache.	*/
-    					/* Collisions are dropped.	*/
-
-#   define FRESH_PAGE_SLOT(h) (divHBLKSZ((word)(h)) & (MAX_FRESH_PAGES-1))
-#   define ADD_FRESH_PAGE(h) \
-	GC_fresh_pages[FRESH_PAGE_SLOT(h)] = (h)
-#   define PAGE_IS_FRESH(h) \
-	(GC_fresh_pages[FRESH_PAGE_SLOT(h)] == (h) && (h) != 0)
-#endif
-
-/* Add all pages in pht2 to pht1 */
-void GC_or_pages(pht1, pht2)
-page_hash_table pht1, pht2;
-{
-    register int i;
-    
-    for (i = 0; i < PHT_SIZE; i++) pht1[i] |= pht2[i];
-}
-
-int GC_proc_fd;
-
-void GC_dirty_init()
-{
-    int fd;
-    char buf[30];
-
-    GC_dirty_maintained = TRUE;
-    if (GC_words_allocd != 0 || GC_words_allocd_before_gc != 0) {
-    	register int i;
-    
-        for (i = 0; i < PHT_SIZE; i++) GC_written_pages[i] = (word)(-1);
-#       ifdef PRINTSTATS
-	    GC_printf1("Allocated words:%lu:all pages may have been written\n",
-	    	       (unsigned long)
-	    	      		(GC_words_allocd + GC_words_allocd_before_gc));
-#	endif       
-    }
-    sprintf(buf, "/proc/%d/pagedata", getpid());
-    GC_proc_fd = open(buf, O_RDONLY);
-    if (GC_proc_fd < 0) {
-    	ABORT("/proc open failed");
-    }
-    syscall(SYS_fcntl, GC_proc_fd, F_SETFD, FD_CLOEXEC);
-    if (GC_proc_fd < 0) {
-    	ABORT("/proc ioctl failed");
-    }
-    GC_proc_buf = GC_scratch_alloc(GC_proc_buf_size);
-#   ifdef GC_SOLARIS_THREADS
-	GC_fresh_pages = (struct hblk **)
-	  GC_scratch_alloc(MAX_FRESH_PAGES * sizeof (struct hblk *));
-	if (GC_fresh_pages == 0) {
-	    GC_err_printf0("No space for fresh pages\n");
-	    EXIT();
-	}
-	BZERO(GC_fresh_pages, MAX_FRESH_PAGES * sizeof (struct hblk *));
-#   endif
-}
-
-/* Ignore write hints. They don't help us here.	*/
-/*ARGSUSED*/
-void GC_remove_protection(h, nblocks, is_ptrfree)
-struct hblk *h;
-word nblocks;
-GC_bool is_ptrfree;
-{
-}
-
-#ifdef GC_SOLARIS_THREADS
-#   define READ(fd,buf,nbytes) syscall(SYS_read, fd, buf, nbytes)
-#else
-#   define READ(fd,buf,nbytes) read(fd, buf, nbytes)
-#endif
-
-void GC_read_dirty()
-{
-    unsigned long ps, np;
-    int nmaps;
-    ptr_t vaddr;
-    struct prasmap * map;
-    char * bufp;
-    ptr_t current_addr, limit;
-    int i;
-int dummy;
-
-    BZERO(GC_grungy_pages, (sizeof GC_grungy_pages));
-    
-    bufp = GC_proc_buf;
-    if (READ(GC_proc_fd, bufp, GC_proc_buf_size) <= 0) {
-#	ifdef PRINTSTATS
-            GC_printf1("/proc read failed: GC_proc_buf_size = %lu\n",
-            	       GC_proc_buf_size);
-#	endif       
-        {
-            /* Retry with larger buffer. */
-            word new_size = 2 * GC_proc_buf_size;
-            char * new_buf = GC_scratch_alloc(new_size);
-            
-            if (new_buf != 0) {
-                GC_proc_buf = bufp = new_buf;
-                GC_proc_buf_size = new_size;
-            }
-            if (READ(GC_proc_fd, bufp, GC_proc_buf_size) <= 0) {
-                WARN("Insufficient space for /proc read\n", 0);
-                /* Punt:	*/
-        	memset(GC_grungy_pages, 0xff, sizeof (page_hash_table));
-		memset(GC_written_pages, 0xff, sizeof(page_hash_table));
-#		ifdef GC_SOLARIS_THREADS
-		    BZERO(GC_fresh_pages,
-		    	  MAX_FRESH_PAGES * sizeof (struct hblk *)); 
-#		endif
-		return;
-            }
-        }
-    }
-    /* Copy dirty bits into GC_grungy_pages */
-    	nmaps = ((struct prpageheader *)bufp) -> pr_nmap;
-	/* printf( "nmaps = %d, PG_REFERENCED = %d, PG_MODIFIED = %d\n",
-		     nmaps, PG_REFERENCED, PG_MODIFIED); */
-	bufp = bufp + sizeof(struct prpageheader);
-	for (i = 0; i < nmaps; i++) {
-	    map = (struct prasmap *)bufp;
-	    vaddr = (ptr_t)(map -> pr_vaddr);
-	    ps = map -> pr_pagesize;
-	    np = map -> pr_npage;
-	    /* printf("vaddr = 0x%X, ps = 0x%X, np = 0x%X\n", vaddr, ps, np); */
-	    limit = vaddr + ps * np;
-	    bufp += sizeof (struct prasmap);
-	    for (current_addr = vaddr;
-	         current_addr < limit; current_addr += ps){
-	        if ((*bufp++) & PG_MODIFIED) {
-	            register struct hblk * h = (struct hblk *) current_addr;
-	            
-	            while ((ptr_t)h < current_addr + ps) {
-	                register word index = PHT_HASH(h);
-	                
-	                set_pht_entry_from_index(GC_grungy_pages, index);
-#			ifdef GC_SOLARIS_THREADS
-			  {
-			    register int slot = FRESH_PAGE_SLOT(h);
-			    
-			    if (GC_fresh_pages[slot] == h) {
-			        GC_fresh_pages[slot] = 0;
-			    }
-			  }
-#			endif
-	                h++;
-	            }
-	        }
-	    }
-	    bufp += sizeof(long) - 1;
-	    bufp = (char *)((unsigned long)bufp & ~(sizeof(long)-1));
-	}
-    /* Update GC_written_pages. */
-        GC_or_pages(GC_written_pages, GC_grungy_pages);
-#   ifdef GC_SOLARIS_THREADS
-      /* Make sure that old stacks are considered completely clean	*/
-      /* unless written again.						*/
-	GC_old_stacks_are_fresh();
-#   endif
-}
-
-#undef READ
-
-GC_bool GC_page_was_dirty(h)
-struct hblk *h;
-{
-    register word index = PHT_HASH(h);
-    register GC_bool result;
-    
-    result = get_pht_entry_from_index(GC_grungy_pages, index);
-#   ifdef GC_SOLARIS_THREADS
-	if (result && PAGE_IS_FRESH(h)) result = FALSE;
-	/* This happens only if page was declared fresh since	*/
-	/* the read_dirty call, e.g. because it's in an unused  */
-	/* thread stack.  It's OK to treat it as clean, in	*/
-	/* that case.  And it's consistent with 		*/
-	/* GC_page_was_ever_dirty.				*/
-#   endif
-    return(result);
-}
-
-GC_bool GC_page_was_ever_dirty(h)
-struct hblk *h;
-{
-    register word index = PHT_HASH(h);
-    register GC_bool result;
-    
-    result = get_pht_entry_from_index(GC_written_pages, index);
-#   ifdef GC_SOLARIS_THREADS
-	if (result && PAGE_IS_FRESH(h)) result = FALSE;
-#   endif
-    return(result);
-}
-
-/* Caller holds allocation lock.	*/
-void GC_is_fresh(h, n)
-struct hblk *h;
-word n;
-{
-
-    register word index;
-    
-#   ifdef GC_SOLARIS_THREADS
-      register word i;
-      
-      if (GC_fresh_pages != 0) {
-        for (i = 0; i < n; i++) {
-          ADD_FRESH_PAGE(h + i);
-        }
-      }
-#   endif
-}
-
-# endif /* PROC_VDB */
-
-
-# ifdef PCR_VDB
-
-# include "vd/PCR_VD.h"
-
-# define NPAGES (32*1024)	/* 128 MB */
-
-PCR_VD_DB  GC_grungy_bits[NPAGES];
-
-ptr_t GC_vd_base;	/* Address corresponding to GC_grungy_bits[0]	*/
-			/* HBLKSIZE aligned.				*/
-
-void GC_dirty_init()
-{
-    GC_dirty_maintained = TRUE;
-    /* For the time being, we assume the heap generally grows up */
-    GC_vd_base = GC_heap_sects[0].hs_start;
-    if (GC_vd_base == 0) {
-   	ABORT("Bad initial heap segment");
-    }
-    if (PCR_VD_Start(HBLKSIZE, GC_vd_base, NPAGES*HBLKSIZE)
-	!= PCR_ERes_okay) {
-	ABORT("dirty bit initialization failed");
-    }
-}
-
-void GC_read_dirty()
-{
-    /* lazily enable dirty bits on newly added heap sects */
-    {
-        static int onhs = 0;
-        int nhs = GC_n_heap_sects;
-        for( ; onhs < nhs; onhs++ ) {
-            PCR_VD_WriteProtectEnable(
-                    GC_heap_sects[onhs].hs_start,
-                    GC_heap_sects[onhs].hs_bytes );
-        }
-    }
-
-
-    if (PCR_VD_Clear(GC_vd_base, NPAGES*HBLKSIZE, GC_grungy_bits)
-        != PCR_ERes_okay) {
-	ABORT("dirty bit read failed");
-    }
-}
-
-GC_bool GC_page_was_dirty(h)
-struct hblk *h;
-{
-    if((ptr_t)h < GC_vd_base || (ptr_t)h >= GC_vd_base + NPAGES*HBLKSIZE) {
-	return(TRUE);
-    }
-    return(GC_grungy_bits[h - (struct hblk *)GC_vd_base] & PCR_VD_DB_dirtyBit);
-}
-
-/*ARGSUSED*/
-void GC_remove_protection(h, nblocks, is_ptrfree)
-struct hblk *h;
-word nblocks;
-GC_bool is_ptrfree;
-{
-    PCR_VD_WriteProtectDisable(h, nblocks*HBLKSIZE);
-    PCR_VD_WriteProtectEnable(h, nblocks*HBLKSIZE);
-}
-
-# endif /* PCR_VDB */
-
-#if defined(MPROTECT_VDB) && defined(DARWIN)
-/* The following sources were used as a *reference* for this exception handling
-   code:
-      1. Apple's mach/xnu documentation
-      2. Timothy J. Wood's "Mach Exception Handlers 101" post to the
-         omnigroup's macosx-dev list. 
-         www.omnigroup.com/mailman/archive/macosx-dev/2000-June/014178.html
-      3. macosx-nat.c from Apple's GDB source code.
-*/
-   
-/* The bug that caused all this trouble should now be fixed. This should
-   eventually be removed if all goes well. */
-/* define BROKEN_EXCEPTION_HANDLING */
-    
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-
-/* These are not defined in any header, although they are documented */
-extern boolean_t exc_server(mach_msg_header_t *,mach_msg_header_t *);
-extern kern_return_t exception_raise(
-    mach_port_t,mach_port_t,mach_port_t,
-    exception_type_t,exception_data_t,mach_msg_type_number_t);
-extern kern_return_t exception_raise_state(
-    mach_port_t,mach_port_t,mach_port_t,
-    exception_type_t,exception_data_t,mach_msg_type_number_t,
-    thread_state_flavor_t*,thread_state_t,mach_msg_type_number_t,
-    thread_state_t,mach_msg_type_number_t*);
-extern kern_return_t exception_raise_state_identity(
-    mach_port_t,mach_port_t,mach_port_t,
-    exception_type_t,exception_data_t,mach_msg_type_number_t,
-    thread_state_flavor_t*,thread_state_t,mach_msg_type_number_t,
-    thread_state_t,mach_msg_type_number_t*);
-
-
-#define MAX_EXCEPTION_PORTS 16
-
-static struct {
-    mach_msg_type_number_t count;
-    exception_mask_t      masks[MAX_EXCEPTION_PORTS];
-    exception_handler_t   ports[MAX_EXCEPTION_PORTS];
-    exception_behavior_t  behaviors[MAX_EXCEPTION_PORTS];
-    thread_state_flavor_t flavors[MAX_EXCEPTION_PORTS];
-} GC_old_exc_ports;
-
-static struct {
-    mach_port_t exception;
-#if defined(THREADS)
-    mach_port_t reply;
-#endif
-} GC_ports;
-
-typedef struct {
-    mach_msg_header_t head;
-} GC_msg_t;
-
-typedef enum {
-    GC_MP_NORMAL, GC_MP_DISCARDING, GC_MP_STOPPED
-} GC_mprotect_state_t;
-
-/* FIXME: 1 and 2 seem to be safe to use in the msgh_id field,
-   but it isn't  documented. Use the source and see if they
-   should be ok. */
-#define ID_STOP 1
-#define ID_RESUME 2
-
-/* These values are only used on the reply port */
-#define ID_ACK 3
-
-#if defined(THREADS)
-
-GC_mprotect_state_t GC_mprotect_state;
-
-/* The following should ONLY be called when the world is stopped  */
-static void GC_mprotect_thread_notify(mach_msg_id_t id) {
-    struct {
-        GC_msg_t msg;
-        mach_msg_trailer_t trailer;
-    } buf;
-    mach_msg_return_t r;
-    /* remote, local */
-    buf.msg.head.msgh_bits = 
-        MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND,0);
-    buf.msg.head.msgh_size = sizeof(buf.msg);
-    buf.msg.head.msgh_remote_port = GC_ports.exception;
-    buf.msg.head.msgh_local_port = MACH_PORT_NULL;
-    buf.msg.head.msgh_id = id;
-            
-    r = mach_msg(
-        &buf.msg.head,
-        MACH_SEND_MSG|MACH_RCV_MSG|MACH_RCV_LARGE,
-        sizeof(buf.msg),
-        sizeof(buf),
-        GC_ports.reply,
-        MACH_MSG_TIMEOUT_NONE,
-        MACH_PORT_NULL);
-    if(r != MACH_MSG_SUCCESS)
-	ABORT("mach_msg failed in GC_mprotect_thread_notify");
-    if(buf.msg.head.msgh_id != ID_ACK)
-        ABORT("invalid ack in GC_mprotect_thread_notify");
-}
-
-/* Should only be called by the mprotect thread */
-static void GC_mprotect_thread_reply() {
-    GC_msg_t msg;
-    mach_msg_return_t r;
-    /* remote, local */
-    msg.head.msgh_bits = 
-        MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND,0);
-    msg.head.msgh_size = sizeof(msg);
-    msg.head.msgh_remote_port = GC_ports.reply;
-    msg.head.msgh_local_port = MACH_PORT_NULL;
-    msg.head.msgh_id = ID_ACK;
-            
-    r = mach_msg(
-        &msg.head,
-        MACH_SEND_MSG,
-        sizeof(msg),
-        0,
-        MACH_PORT_NULL,
-        MACH_MSG_TIMEOUT_NONE,
-        MACH_PORT_NULL);
-    if(r != MACH_MSG_SUCCESS)
-	ABORT("mach_msg failed in GC_mprotect_thread_reply");
-}
-
-void GC_mprotect_stop() {
-    GC_mprotect_thread_notify(ID_STOP);
-}
-void GC_mprotect_resume() {
-    GC_mprotect_thread_notify(ID_RESUME);
-}
-
-#else /* !THREADS */
-/* The compiler should optimize away any GC_mprotect_state computations */
-#define GC_mprotect_state GC_MP_NORMAL
-#endif
-
-static void *GC_mprotect_thread(void *arg) {
-    mach_msg_return_t r;
-    /* These two structures contain some private kernel data. We don't need to
-       access any of it so we don't bother defining a proper struct. The
-       correct definitions are in the xnu source code. */
-    struct {
-        mach_msg_header_t head;
-        char data[256];
-    } reply;
-    struct {
-        mach_msg_header_t head;
-        mach_msg_body_t msgh_body;
-        char data[1024];
-    } msg;
-
-    mach_msg_id_t id;
-
-    GC_darwin_register_mach_handler_thread(mach_thread_self());
-    
-    for(;;) {
-        r = mach_msg(
-            &msg.head,
-            MACH_RCV_MSG|MACH_RCV_LARGE|
-                (GC_mprotect_state == GC_MP_DISCARDING ? MACH_RCV_TIMEOUT : 0),
-            0,
-            sizeof(msg),
-            GC_ports.exception,
-            GC_mprotect_state == GC_MP_DISCARDING ? 0 : MACH_MSG_TIMEOUT_NONE,
-            MACH_PORT_NULL);
-        
-        id = r == MACH_MSG_SUCCESS ? msg.head.msgh_id : -1;
-        
-#if defined(THREADS)
-        if(GC_mprotect_state == GC_MP_DISCARDING) {
-            if(r == MACH_RCV_TIMED_OUT) {
-                GC_mprotect_state = GC_MP_STOPPED;
-                GC_mprotect_thread_reply();
-                continue;
-            }
-            if(r == MACH_MSG_SUCCESS && (id == ID_STOP || id == ID_RESUME))
-                ABORT("out of order mprotect thread request");
-        }
-#endif
-        
-        if(r != MACH_MSG_SUCCESS) {
-            GC_err_printf2("mach_msg failed with %d %s\n", 
-                (int)r,mach_error_string(r));
-            ABORT("mach_msg failed");
-        }
-        
-        switch(id) {
-#if defined(THREADS)
-            case ID_STOP:
-                if(GC_mprotect_state != GC_MP_NORMAL)
-                    ABORT("Called mprotect_stop when state wasn't normal");
-                GC_mprotect_state = GC_MP_DISCARDING;
-                break;
-            case ID_RESUME:
-                if(GC_mprotect_state != GC_MP_STOPPED)
-                    ABORT("Called mprotect_resume when state wasn't stopped");
-                GC_mprotect_state = GC_MP_NORMAL;
-                GC_mprotect_thread_reply();
-                break;
-#endif /* THREADS */
-            default:
-	            /* Handle the message (calls catch_exception_raise) */
-    	        if(!exc_server(&msg.head,&reply.head))
-                    ABORT("exc_server failed");
-                /* Send the reply */
-                r = mach_msg(
-                    &reply.head,
-                    MACH_SEND_MSG,
-                    reply.head.msgh_size,
-                    0,
-                    MACH_PORT_NULL,
-                    MACH_MSG_TIMEOUT_NONE,
-                    MACH_PORT_NULL);
-	        if(r != MACH_MSG_SUCCESS) {
-	        	/* This will fail if the thread dies, but the thread shouldn't
-	        	   die... */
-	        	#ifdef BROKEN_EXCEPTION_HANDLING
-    	        	GC_err_printf2(
-                        "mach_msg failed with %d %s while sending exc reply\n",
-                        (int)r,mach_error_string(r));
-    	        #else
-    	        	ABORT("mach_msg failed while sending exception reply");
-    	        #endif
-        	}
-        } /* switch */
-    } /* for(;;) */
-    /* NOT REACHED */
-    return NULL;
-}
-
-/* All this SIGBUS code shouldn't be necessary. All protection faults should
-   be going throught the mach exception handler. However, it seems a SIGBUS is
-   occasionally sent for some unknown reason. Even more odd, it seems to be
-   meaningless and safe to ignore. */
-#ifdef BROKEN_EXCEPTION_HANDLING
-
-typedef void (* SIG_PF)();
-static SIG_PF GC_old_bus_handler;
-
-/* Updates to this aren't atomic, but the SIGBUSs seem pretty rare.
-   Even if this doesn't get updated property, it isn't really a problem */
-static int GC_sigbus_count;
-
-static void GC_darwin_sigbus(int num,siginfo_t *sip,void *context) {
-    if(num != SIGBUS) ABORT("Got a non-sigbus signal in the sigbus handler");
-    
-    /* Ugh... some seem safe to ignore, but too many in a row probably means
-       trouble. GC_sigbus_count is reset for each mach exception that is
-       handled */
-    if(GC_sigbus_count >= 8) {
-        ABORT("Got more than 8 SIGBUSs in a row!");
-    } else {
-        GC_sigbus_count++;
-        GC_err_printf0("GC: WARNING: Ignoring SIGBUS.\n");
-    }
-}
-#endif /* BROKEN_EXCEPTION_HANDLING */
-
-void GC_dirty_init() {
-    kern_return_t r;
-    mach_port_t me;
-    pthread_t thread;
-    pthread_attr_t attr;
-    exception_mask_t mask;
-    
-#   ifdef PRINTSTATS
-        GC_printf0("Inititalizing mach/darwin mprotect virtual dirty bit "
-            "implementation\n");
-#   endif  
-#	ifdef BROKEN_EXCEPTION_HANDLING
-        GC_err_printf0("GC: WARNING: Enabling workarounds for various darwin "
-            "exception handling bugs.\n");
-#	endif
-    GC_dirty_maintained = TRUE;
-    if (GC_page_size % HBLKSIZE != 0) {
-        GC_err_printf0("Page size not multiple of HBLKSIZE\n");
-        ABORT("Page size not multiple of HBLKSIZE");
-    }
-    
-    GC_task_self = me = mach_task_self();
-    
-    r = mach_port_allocate(me,MACH_PORT_RIGHT_RECEIVE,&GC_ports.exception);
-    if(r != KERN_SUCCESS) ABORT("mach_port_allocate failed (exception port)");
-    
-    r = mach_port_insert_right(me,GC_ports.exception,GC_ports.exception,
-    	MACH_MSG_TYPE_MAKE_SEND);
-    if(r != KERN_SUCCESS)
-    	ABORT("mach_port_insert_right failed (exception port)");
-
-    #if defined(THREADS)
-        r = mach_port_allocate(me,MACH_PORT_RIGHT_RECEIVE,&GC_ports.reply);
-        if(r != KERN_SUCCESS) ABORT("mach_port_allocate failed (reply port)");
-    #endif
-
-    /* The exceptions we want to catch */  
-    mask = EXC_MASK_BAD_ACCESS;
-
-    r = task_get_exception_ports(
-        me,
-        mask,
-        GC_old_exc_ports.masks,
-        &GC_old_exc_ports.count,
-        GC_old_exc_ports.ports,
-        GC_old_exc_ports.behaviors,
-        GC_old_exc_ports.flavors
-    );
-    if(r != KERN_SUCCESS) ABORT("task_get_exception_ports failed");
-        
-    r = task_set_exception_ports(
-        me,
-        mask,
-        GC_ports.exception,
-        EXCEPTION_DEFAULT,
-        GC_MACH_THREAD_STATE
-    );
-    if(r != KERN_SUCCESS) ABORT("task_set_exception_ports failed");
-
-    if(pthread_attr_init(&attr) != 0) ABORT("pthread_attr_init failed");
-    if(pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED) != 0) 
-        ABORT("pthread_attr_setdetachedstate failed");
-
-#	undef pthread_create
-    /* This will call the real pthread function, not our wrapper */
-    if(pthread_create(&thread,&attr,GC_mprotect_thread,NULL) != 0)
-        ABORT("pthread_create failed");
-    pthread_attr_destroy(&attr);
-    
-    /* Setup the sigbus handler for ignoring the meaningless SIGBUSs */
-    #ifdef BROKEN_EXCEPTION_HANDLING 
-    {
-        struct sigaction sa, oldsa;
-        sa.sa_handler = (SIG_PF)GC_darwin_sigbus;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = SA_RESTART|SA_SIGINFO;
-        if(sigaction(SIGBUS,&sa,&oldsa) < 0) ABORT("sigaction");
-        GC_old_bus_handler = (SIG_PF)oldsa.sa_handler;
-        if (GC_old_bus_handler != SIG_DFL) {
-#       	ifdef PRINTSTATS
-                GC_err_printf0("Replaced other SIGBUS handler\n");
-#       	endif
-        }
-    }
-    #endif /* BROKEN_EXCEPTION_HANDLING  */
-}
- 
-/* The source code for Apple's GDB was used as a reference for the exception
-   forwarding code. This code is similar to be GDB code only because there is 
-   only one way to do it. */
-static kern_return_t GC_forward_exception(
-        mach_port_t thread,
-        mach_port_t task,
-        exception_type_t exception,
-        exception_data_t data,
-        mach_msg_type_number_t data_count
-) {
-    int i;
-    kern_return_t r;
-    mach_port_t port;
-    exception_behavior_t behavior;
-    thread_state_flavor_t flavor;
-    
-    thread_state_t thread_state;
-    mach_msg_type_number_t thread_state_count = THREAD_STATE_MAX;
-        
-    for(i=0;i<GC_old_exc_ports.count;i++)
-        if(GC_old_exc_ports.masks[i] & (1 << exception))
-            break;
-    if(i==GC_old_exc_ports.count) ABORT("No handler for exception!");
-    
-    port = GC_old_exc_ports.ports[i];
-    behavior = GC_old_exc_ports.behaviors[i];
-    flavor = GC_old_exc_ports.flavors[i];
-
-    if(behavior != EXCEPTION_DEFAULT) {
-        r = thread_get_state(thread,flavor,thread_state,&thread_state_count);
-        if(r != KERN_SUCCESS)
-            ABORT("thread_get_state failed in forward_exception");
-    }
-    
-    switch(behavior) {
-        case EXCEPTION_DEFAULT:
-            r = exception_raise(port,thread,task,exception,data,data_count);
-            break;
-        case EXCEPTION_STATE:
-            r = exception_raise_state(port,thread,task,exception,data,
-                data_count,&flavor,thread_state,thread_state_count,
-                thread_state,&thread_state_count);
-            break;
-        case EXCEPTION_STATE_IDENTITY:
-            r = exception_raise_state_identity(port,thread,task,exception,data,
-                data_count,&flavor,thread_state,thread_state_count,
-                thread_state,&thread_state_count);
-            break;
-        default:
-            r = KERN_FAILURE; /* make gcc happy */
-            ABORT("forward_exception: unknown behavior");
-            break;
-    }
-    
-    if(behavior != EXCEPTION_DEFAULT) {
-        r = thread_set_state(thread,flavor,thread_state,thread_state_count);
-        if(r != KERN_SUCCESS)
-            ABORT("thread_set_state failed in forward_exception");
-    }
-    
-    return r;
-}
-
-#define FWD() GC_forward_exception(thread,task,exception,code,code_count)
-
-/* This violates the namespace rules but there isn't anything that can be done
-   about it. The exception handling stuff is hard coded to call this */
-kern_return_t
-catch_exception_raise(
-   mach_port_t exception_port,mach_port_t thread,mach_port_t task,
-   exception_type_t exception,exception_data_t code,
-   mach_msg_type_number_t code_count
-) {
-    kern_return_t r;
-    char *addr;
-    struct hblk *h;
-    int i;
-#   if defined(POWERPC)
-#     if CPP_WORDSZ == 32
-        thread_state_flavor_t flavor = PPC_EXCEPTION_STATE;
-        mach_msg_type_number_t exc_state_count = PPC_EXCEPTION_STATE_COUNT;
-        ppc_exception_state_t exc_state;
-#     else
-        thread_state_flavor_t flavor = PPC_EXCEPTION_STATE64;
-        mach_msg_type_number_t exc_state_count = PPC_EXCEPTION_STATE64_COUNT;
-        ppc_exception_state64_t exc_state;
-#     endif
-#   elif defined(I386) || defined(X86_64)
-#     if CPP_WORDSZ == 32
-	thread_state_flavor_t flavor = x86_EXCEPTION_STATE32;
-	mach_msg_type_number_t exc_state_count = x86_EXCEPTION_STATE32_COUNT;
-	x86_exception_state32_t exc_state;
-#     else
-	thread_state_flavor_t flavor = x86_EXCEPTION_STATE64;
-	mach_msg_type_number_t exc_state_count = x86_EXCEPTION_STATE64_COUNT;
-	x86_exception_state64_t exc_state;
-#     endif
-#   else
-#	error FIXME for non-ppc darwin
-#   endif
-
-    
-    if(exception != EXC_BAD_ACCESS || code[0] != KERN_PROTECTION_FAILURE) {
-        #ifdef DEBUG_EXCEPTION_HANDLING
-        /* We aren't interested, pass it on to the old handler */
-        GC_printf3("Exception: 0x%x Code: 0x%x 0x%x in catch....\n",
-            exception,
-            code_count > 0 ? code[0] : -1,
-            code_count > 1 ? code[1] : -1); 
-        #endif
-        return FWD();
-    }
-
-    r = thread_get_state(thread,flavor,
-        (natural_t*)&exc_state,&exc_state_count);
-    if(r != KERN_SUCCESS) {
-        /* The thread is supposed to be suspended while the exception handler
-           is called. This shouldn't fail. */
-        #ifdef BROKEN_EXCEPTION_HANDLING
-            GC_err_printf0("thread_get_state failed in "
-                "catch_exception_raise\n");
-            return KERN_SUCCESS;
-        #else
-            ABORT("thread_get_state failed in catch_exception_raise");
-        #endif
-    }
-    
-    /* This is the address that caused the fault */
-#if defined(POWERPC)
-    addr = (char*) exc_state. THREAD_FLD(dar);
-#elif defined (I386) || defined (X86_64)
-    addr = (char*) exc_state. THREAD_FLD(faultvaddr);
-#else
-#   error FIXME for non POWERPC/I386
-#endif
-        
-    if((HDR(addr)) == 0) {
-        /* Ugh... just like the SIGBUS problem above, it seems we get a bogus 
-           KERN_PROTECTION_FAILURE every once and a while. We wait till we get
-           a bunch in a row before doing anything about it. If a "real" fault 
-           ever occurres it'll just keep faulting over and over and we'll hit
-           the limit pretty quickly. */
-        #ifdef BROKEN_EXCEPTION_HANDLING
-            static char *last_fault;
-            static int last_fault_count;
-            
-            if(addr != last_fault) {
-                last_fault = addr;
-                last_fault_count = 0;
-            }
-            if(++last_fault_count < 32) {
-                if(last_fault_count == 1)
-                    GC_err_printf1(
-                        "GC: WARNING: Ignoring KERN_PROTECTION_FAILURE at %p\n",
-                        addr);
-                return KERN_SUCCESS;
-            }
-            
-            GC_err_printf1("Unexpected KERN_PROTECTION_FAILURE at %p\n",addr);
-            /* Can't pass it along to the signal handler because that is
-               ignoring SIGBUS signals. We also shouldn't call ABORT here as
-               signals don't always work too well from the exception handler. */
-            GC_err_printf0("Aborting\n");
-            exit(EXIT_FAILURE);
-        #else /* BROKEN_EXCEPTION_HANDLING */
-            /* Pass it along to the next exception handler 
-               (which should call SIGBUS/SIGSEGV) */
-            return FWD();
-        #endif /* !BROKEN_EXCEPTION_HANDLING */
-    }
-
-    #ifdef BROKEN_EXCEPTION_HANDLING
-        /* Reset the number of consecutive SIGBUSs */
-        GC_sigbus_count = 0;
-    #endif
-    
-    if(GC_mprotect_state == GC_MP_NORMAL) { /* common case */
-        h = (struct hblk*)((word)addr & ~(GC_page_size-1));
-        UNPROTECT(h, GC_page_size);	
-        for (i = 0; i < divHBLKSZ(GC_page_size); i++) {
-            register int index = PHT_HASH(h+i);
-            async_set_pht_entry_from_index(GC_dirty_pages, index);
-        }
-    } else if(GC_mprotect_state == GC_MP_DISCARDING) {
-        /* Lie to the thread for now. No sense UNPROTECT()ing the memory
-           when we're just going to PROTECT() it again later. The thread
-           will just fault again once it resumes */
-    } else {
-        /* Shouldn't happen, i don't think */
-        GC_printf0("KERN_PROTECTION_FAILURE while world is stopped\n");
-        return FWD();
-    }
-    return KERN_SUCCESS;
-}
-#undef FWD
-
-/* These should never be called, but just in case...  */
-kern_return_t catch_exception_raise_state(mach_port_name_t exception_port,
-    int exception, exception_data_t code, mach_msg_type_number_t codeCnt,
-    int flavor, thread_state_t old_state, int old_stateCnt,
-    thread_state_t new_state, int new_stateCnt)
-{
-    ABORT("catch_exception_raise_state");
-    return(KERN_INVALID_ARGUMENT);
-}
-kern_return_t catch_exception_raise_state_identity(
-    mach_port_name_t exception_port, mach_port_t thread, mach_port_t task,
-    int exception, exception_data_t code, mach_msg_type_number_t codeCnt,
-    int flavor, thread_state_t old_state, int old_stateCnt, 
-    thread_state_t new_state, int new_stateCnt)
-{
-    ABORT("catch_exception_raise_state_identity");
-    return(KERN_INVALID_ARGUMENT);
-}
-
-
-#endif /* DARWIN && MPROTECT_VDB */
-
-# ifndef HAVE_INCREMENTAL_PROTECTION_NEEDS
-  int GC_incremental_protection_needs()
-  {
-    return GC_PROTECTS_NONE;
-  }
-# endif /* !HAVE_INCREMENTAL_PROTECTION_NEEDS */
-
-/*
- * Call stack save code for debugging.
- * Should probably be in mach_dep.c, but that requires reorganization.
- */
-
-/* I suspect the following works for most X86 *nix variants, so 	*/
-/* long as the frame pointer is explicitly stored.  In the case of gcc,	*/
-/* compiler flags (e.g. -fomit-frame-pointer) determine whether it is.	*/
-#if defined(I386) && defined(LINUX) && defined(SAVE_CALL_CHAIN)
-#   include <features.h>
-
-    struct frame {
-	struct frame *fr_savfp;
-	long	fr_savpc;
-        long	fr_arg[NARGS];  /* All the arguments go here.	*/
-    };
-#endif
-
-#if defined(SPARC)
-#  if defined(LINUX)
-#    include <features.h>
-
-     struct frame {
-	long	fr_local[8];
-	long	fr_arg[6];
-	struct frame *fr_savfp;
-	long	fr_savpc;
-#       ifndef __arch64__
-	  char	*fr_stret;
-#       endif
-	long	fr_argd[6];
-	long	fr_argx[0];
-     };
-#  else
-#    if defined(SUNOS4)
-#      include <machine/frame.h>
-#    else
-#      if defined (DRSNX)
-#	 include <sys/sparc/frame.h>
-#      else
-#	 if defined(OPENBSD)
-#	   include <frame.h>
-#	 else
-#	   if defined(FREEBSD) || defined(NETBSD)
-#	     include <machine/frame.h>
-#	   else
-#	     include <sys/frame.h>
-#	   endif
-#	 endif
-#      endif
-#    endif
-#  endif
-#  if NARGS > 6
-	--> We only know how to to get the first 6 arguments
-#  endif
-#endif /* SPARC */
-
-#ifdef  NEED_CALLINFO
-/* Fill in the pc and argument information for up to NFRAMES of my	*/
-/* callers.  Ignore my frame and my callers frame.			*/
-
-#ifdef LINUX
-#   include <unistd.h>
-#endif
-
-#endif /* NEED_CALLINFO */
-
-#if defined(GC_HAVE_BUILTIN_BACKTRACE)
-# include <execinfo.h>
-#endif
-
-#ifdef SAVE_CALL_CHAIN
-
-#if NARGS == 0 && NFRAMES % 2 == 0 /* No padding */ \
-    && defined(GC_HAVE_BUILTIN_BACKTRACE)
-
-#ifdef REDIRECT_MALLOC
-  /* Deal with possible malloc calls in backtrace by omitting	*/
-  /* the infinitely recursing backtrace.			*/
-# ifdef THREADS
-    __thread 	/* If your compiler doesn't understand this */
-    		/* you could use something like pthread_getspecific.	*/
-# endif
-  GC_in_save_callers = FALSE;
-#endif
-
-void GC_save_callers (info) 
-struct callinfo info[NFRAMES];
-{
-  void * tmp_info[NFRAMES + 1];
-  int npcs, i;
-# define IGNORE_FRAMES 1
-  
-  /* We retrieve NFRAMES+1 pc values, but discard the first, since it	*/
-  /* points to our own frame.						*/
-# ifdef REDIRECT_MALLOC
-    if (GC_in_save_callers) {
-      info[0].ci_pc = (word)(&GC_save_callers);
-      for (i = 1; i < NFRAMES; ++i) info[i].ci_pc = 0;
-      return;
-    }
-    GC_in_save_callers = TRUE;
-# endif
-  GC_ASSERT(sizeof(struct callinfo) == sizeof(void *));
-  npcs = backtrace((void **)tmp_info, NFRAMES + IGNORE_FRAMES);
-  BCOPY(tmp_info+IGNORE_FRAMES, info, (npcs - IGNORE_FRAMES) * sizeof(void *));
-  for (i = npcs - IGNORE_FRAMES; i < NFRAMES; ++i) info[i].ci_pc = 0;
-# ifdef REDIRECT_MALLOC
-    GC_in_save_callers = FALSE;
-# endif
-}
-
-#else /* No builtin backtrace; do it ourselves */
-
-#if (defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD)) && defined(SPARC)
-#  define FR_SAVFP fr_fp
-#  define FR_SAVPC fr_pc
-#else
-#  define FR_SAVFP fr_savfp
-#  define FR_SAVPC fr_savpc
-#endif
-
-#if defined(SPARC) && (defined(__arch64__) || defined(__sparcv9))
-#   define BIAS 2047
-#else
-#   define BIAS 0
-#endif
-
-void GC_save_callers (info) 
-struct callinfo info[NFRAMES];
-{
-  struct frame *frame;
-  struct frame *fp;
-  int nframes = 0;
-# ifdef I386
-    /* We assume this is turned on only with gcc as the compiler. */
-    asm("movl %%ebp,%0" : "=r"(frame));
-    fp = frame;
-# else
-    frame = (struct frame *) GC_save_regs_in_stack ();
-    fp = (struct frame *)((long) frame -> FR_SAVFP + BIAS);
-#endif
-  
-   for (; (!(fp HOTTER_THAN frame) && !(GC_stackbottom HOTTER_THAN (ptr_t)fp)
-	   && (nframes < NFRAMES));
-       fp = (struct frame *)((long) fp -> FR_SAVFP + BIAS), nframes++) {
-      register int i;
-      
-      info[nframes].ci_pc = fp->FR_SAVPC;
-#     if NARGS > 0
-        for (i = 0; i < NARGS; i++) {
-	  info[nframes].ci_arg[i] = ~(fp->fr_arg[i]);
-        }
-#     endif /* NARGS > 0 */
-  }
-  if (nframes < NFRAMES) info[nframes].ci_pc = 0;
-}
-
-#endif /* No builtin backtrace */
-
-#endif /* SAVE_CALL_CHAIN */
-
-#ifdef NEED_CALLINFO
-
-/* Print info to stderr.  We do NOT hold the allocation lock */
-void GC_print_callers (info)
-struct callinfo info[NFRAMES];
-{
-    register int i;
-    static int reentry_count = 0;
-    GC_bool stop = FALSE;
-
-    /* FIXME: This should probably use a different lock, so that we	*/
-    /* become callable with or without the allocation lock.		*/
-    LOCK();
-      ++reentry_count;
-    UNLOCK();
-    
-#   if NFRAMES == 1
-      GC_err_printf0("\tCaller at allocation:\n");
-#   else
-      GC_err_printf0("\tCall chain at allocation:\n");
-#   endif
-    for (i = 0; i < NFRAMES && !stop ; i++) {
-     	if (info[i].ci_pc == 0) break;
-#	if NARGS > 0
-	{
-	  int j;
-
-     	  GC_err_printf0("\t\targs: ");
-     	  for (j = 0; j < NARGS; j++) {
-     	    if (j != 0) GC_err_printf0(", ");
-     	    GC_err_printf2("%d (0x%X)", ~(info[i].ci_arg[j]),
-     	    				~(info[i].ci_arg[j]));
-     	  }
-	  GC_err_printf0("\n");
-	}
-# 	endif
-        if (reentry_count > 1) {
-	    /* We were called during an allocation during	*/
-	    /* a previous GC_print_callers call; punt.		*/
-     	    GC_err_printf1("\t\t##PC##= 0x%lx\n", info[i].ci_pc);
-	    continue;
-	}
-	{
-#	  ifdef LINUX
-	    FILE *pipe;
-#	  endif
-#	  if defined(GC_HAVE_BUILTIN_BACKTRACE) \
-	     && !defined(GC_BACKTRACE_SYMBOLS_BROKEN)
-	    char **sym_name =
-	      backtrace_symbols((void **)(&(info[i].ci_pc)), 1);
-	    char *name = sym_name[0];
-#	  else
-	    char buf[40];
-	    char *name = buf;
-     	    sprintf(buf, "##PC##= 0x%lx", info[i].ci_pc);
-#	  endif
-#	  if defined(LINUX) && !defined(SMALL_CONFIG)
-	    /* Try for a line number. */
-	    {
-#	        define EXE_SZ 100
-		static char exe_name[EXE_SZ];
-#		define CMD_SZ 200
-		char cmd_buf[CMD_SZ];
-#		define RESULT_SZ 200
-		static char result_buf[RESULT_SZ];
-		size_t result_len;
-		char *old_preload;
-#		define PRELOAD_SZ 200
-    		char preload_buf[PRELOAD_SZ];
-		static GC_bool found_exe_name = FALSE;
-		static GC_bool will_fail = FALSE;
-		int ret_code;
-		/* Try to get it via a hairy and expensive scheme.	*/
-		/* First we get the name of the executable:		*/
-		if (will_fail) goto out;
-		if (!found_exe_name) { 
-		  ret_code = readlink("/proc/self/exe", exe_name, EXE_SZ);
-		  if (ret_code < 0 || ret_code >= EXE_SZ
-		      || exe_name[0] != '/') {
-		    will_fail = TRUE;	/* Dont try again. */
-		    goto out;
-		  }
-		  exe_name[ret_code] = '\0';
-		  found_exe_name = TRUE;
-		}
-		/* Then we use popen to start addr2line -e <exe> <addr>	*/
-		/* There are faster ways to do this, but hopefully this	*/
-		/* isn't time critical.					*/
-		sprintf(cmd_buf, "/usr/bin/addr2line -f -e %s 0x%lx", exe_name,
-				 (unsigned long)info[i].ci_pc);
-		old_preload = getenv ("LD_PRELOAD");
-	        if (0 != old_preload) {
-		  if (strlen (old_preload) >= PRELOAD_SZ) {
-		    will_fail = TRUE;
-		    goto out;
-		  }
-		  strcpy (preload_buf, old_preload);
-		  unsetenv ("LD_PRELOAD");
-	        }
-		pipe = popen(cmd_buf, "r");
-		if (0 != old_preload
-		    && 0 != setenv ("LD_PRELOAD", preload_buf, 0)) {
-		  WARN("Failed to reset LD_PRELOAD\n", 0);
-      		}
-		if (pipe == NULL
-		    || (result_len = fread(result_buf, 1, RESULT_SZ - 1, pipe))
-		       == 0) {
-		  if (pipe != NULL) pclose(pipe);
-		  will_fail = TRUE;
-		  goto out;
-		}
-		if (result_buf[result_len - 1] == '\n') --result_len;
-		result_buf[result_len] = 0;
-		if (result_buf[0] == '?'
-		    || result_buf[result_len-2] == ':' 
-		       && result_buf[result_len-1] == '0') {
-		    pclose(pipe);
-		    goto out;
-		}
-		/* Get rid of embedded newline, if any.  Test for "main" */
-		{
-		   char * nl = strchr(result_buf, '\n');
-		   if (nl != NULL && nl < result_buf + result_len) {
-		     *nl = ':';
-		   }
-		   if (strncmp(result_buf, "main", nl - result_buf) == 0) {
-		     stop = TRUE;
-		   }
-		}
-		if (result_len < RESULT_SZ - 25) {
-		  /* Add in hex address	*/
-		    sprintf(result_buf + result_len, " [0x%lx]",
-			  (unsigned long)info[i].ci_pc);
-		}
-		name = result_buf;
-		pclose(pipe);
-		out:;
-	    }
-#	  endif /* LINUX */
-	  GC_err_printf1("\t\t%s\n", name);
-#	  if defined(GC_HAVE_BUILTIN_BACKTRACE) \
-	     && !defined(GC_BACKTRACE_SYMBOLS_BROKEN)
-	    free(sym_name);  /* May call GC_free; that's OK */
-#         endif
-	}
-    }
-    LOCK();
-      --reentry_count;
-    UNLOCK();
-}
-
-#endif /* NEED_CALLINFO */
-
-
-
-#if defined(LINUX) && defined(__ELF__) && !defined(SMALL_CONFIG)
-
-/* Dump /proc/self/maps to GC_stderr, to enable looking up names for
-   addresses in FIND_LEAK output. */
-
-static word dump_maps(char *maps)
-{
-    GC_err_write(maps, strlen(maps));
-    return 1;
-}
-
-void GC_print_address_map()
-{
-    GC_err_printf0("---------- Begin address map ----------\n");
-    GC_apply_to_maps(dump_maps);
-    GC_err_printf0("---------- End address map ----------\n");
-}
-
-#endif
-
-
diff --git a/boehm-gc/pc_excludes b/boehm-gc/pc_excludes
deleted file mode 100644
index 15c904551be..00000000000
--- a/boehm-gc/pc_excludes
+++ /dev/null
@@ -1,21 +0,0 @@
-solaris_threads.c
-solaris_pthreads.c
-irix_threads.c
-pcr_interface.c
-real_malloc.c
-mips_mach_dep.s
-rs6000_mach_dep.s
-alpha_mach_dep.s
-sparc_mach_dep.s
-PCR-Makefile
-setjmp_t.c
-callprocs
-doc/gc.man
-pc_excludes
-barrett_diagram
-include/gc_c++.h
-include/gc_inline.h
-doc/README.hp
-doc/README.rs6000
-doc/README.sgi
-
diff --git a/boehm-gc/pcr_interface.c b/boehm-gc/pcr_interface.c
deleted file mode 100644
index 7bf02a45c69..00000000000
--- a/boehm-gc/pcr_interface.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* 
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-# include "private/gc_priv.h"
-
-# ifdef PCR
-/*
- * Note that POSIX PCR requires an ANSI C compiler.  Hence we are allowed
- * to make the same assumption here.
- * We wrap all of the allocator functions to avoid questions of
- * compatibility between the prototyped and nonprototyped versions of the f
- */
-# include "config/PCR_StdTypes.h"
-# include "mm/PCR_MM.h"
-# include <errno.h>
-
-# define MY_MAGIC 17L
-# define MY_DEBUGMAGIC 42L
-
-void * GC_AllocProc(size_t size, PCR_Bool ptrFree, PCR_Bool clear )
-{
-    if (ptrFree) {
-        void * result = (void *)GC_malloc_atomic(size);
-        if (clear && result != 0) BZERO(result, size);
-        return(result);
-    } else {
-        return((void *)GC_malloc(size));
-    }
-}
-
-void * GC_DebugAllocProc(size_t size, PCR_Bool ptrFree, PCR_Bool clear )
-{
-    if (ptrFree) {
-        void * result = (void *)GC_debug_malloc_atomic(size, __FILE__,
-        						     __LINE__);
-        if (clear && result != 0) BZERO(result, size);
-        return(result);
-    } else {
-        return((void *)GC_debug_malloc(size, __FILE__, __LINE__));
-    }
-}
-
-# define GC_ReallocProc GC_realloc
-void * GC_DebugReallocProc(void * old_object, size_t new_size_in_bytes)
-{
-    return(GC_debug_realloc(old_object, new_size_in_bytes, __FILE__, __LINE__));
-}
-
-# define GC_FreeProc GC_free
-# define GC_DebugFreeProc GC_debug_free
-
-typedef struct {
-  PCR_ERes (*ed_proc)(void *p, size_t size, PCR_Any data);
-  GC_bool ed_pointerfree;
-  PCR_ERes ed_fail_code;
-  PCR_Any ed_client_data;
-} enumerate_data;
-
-void GC_enumerate_block(h, ed)
-register struct hblk *h;
-enumerate_data * ed;
-{
-    register hdr * hhdr;
-    register int sz;
-    word *p;
-    word * lim;
-    
-    hhdr = HDR(h);
-    sz = hhdr -> hb_sz;
-    if (sz >= 0 && ed -> ed_pointerfree
-    	|| sz <= 0 && !(ed -> ed_pointerfree)) return;
-    if (sz < 0) sz = -sz;
-    lim = (word *)(h+1) - sz;
-    p = (word *)h;
-    do {
-        if (PCR_ERes_IsErr(ed -> ed_fail_code)) return;
-        ed -> ed_fail_code =
-            (*(ed -> ed_proc))(p, WORDS_TO_BYTES(sz), ed -> ed_client_data);
-        p+= sz;
-    } while (p <= lim);
-}
-
-struct PCR_MM_ProcsRep * GC_old_allocator = 0;
-
-PCR_ERes GC_EnumerateProc(
-    PCR_Bool ptrFree,
-    PCR_ERes (*proc)(void *p, size_t size, PCR_Any data),
-    PCR_Any data
-)
-{
-    enumerate_data ed;
-    
-    ed.ed_proc = proc;
-    ed.ed_pointerfree = ptrFree;
-    ed.ed_fail_code = PCR_ERes_okay;
-    ed.ed_client_data = data;
-    GC_apply_to_all_blocks(GC_enumerate_block, &ed);
-    if (ed.ed_fail_code != PCR_ERes_okay) {
-        return(ed.ed_fail_code);
-    } else {
-    	/* Also enumerate objects allocated by my predecessors */
-    	return((*(GC_old_allocator->mmp_enumerate))(ptrFree, proc, data));
-    }
-}
-
-void GC_DummyFreeProc(void *p) {}
-
-void GC_DummyShutdownProc(void) {}
-
-struct PCR_MM_ProcsRep GC_Rep = {
-	MY_MAGIC,
-	GC_AllocProc,
-	GC_ReallocProc,
-	GC_DummyFreeProc,  	/* mmp_free */
-	GC_FreeProc,  		/* mmp_unsafeFree */
-	GC_EnumerateProc,
-	GC_DummyShutdownProc	/* mmp_shutdown */
-};
-
-struct PCR_MM_ProcsRep GC_DebugRep = {
-	MY_DEBUGMAGIC,
-	GC_DebugAllocProc,
-	GC_DebugReallocProc,
-	GC_DummyFreeProc,  	/* mmp_free */
-	GC_DebugFreeProc,  		/* mmp_unsafeFree */
-	GC_EnumerateProc,
-	GC_DummyShutdownProc	/* mmp_shutdown */
-};
-
-GC_bool GC_use_debug = 0;
-
-void GC_pcr_install()
-{
-    PCR_MM_Install((GC_use_debug? &GC_DebugRep : &GC_Rep), &GC_old_allocator);
-}
-
-PCR_ERes
-PCR_GC_Setup(void)
-{
-    return PCR_ERes_okay;
-}
-
-PCR_ERes
-PCR_GC_Run(void)
-{
-
-    if( !PCR_Base_TestPCRArg("-nogc") ) {
-        GC_quiet = ( PCR_Base_TestPCRArg("-gctrace") ? 0 : 1 );
-        GC_use_debug = (GC_bool)PCR_Base_TestPCRArg("-debug_alloc");
-        GC_init();
-        if( !PCR_Base_TestPCRArg("-nogc_incremental") ) {
-            /*
-             * awful hack to test whether VD is implemented ...
-             */
-            if( PCR_VD_Start( 0, NIL, 0) != PCR_ERes_FromErr(ENOSYS) ) {
-	        GC_enable_incremental();
-	    }
-	}
-    }
-    return PCR_ERes_okay;
-}
-
-void GC_push_thread_structures(void)
-{
-    /* PCR doesn't work unless static roots are pushed.  Can't get here. */
-    ABORT("In GC_push_thread_structures()");
-}
-
-# endif
diff --git a/boehm-gc/powerpc_darwin_mach_dep.s b/boehm-gc/powerpc_darwin_mach_dep.s
deleted file mode 100644
index d61acc034c4..00000000000
--- a/boehm-gc/powerpc_darwin_mach_dep.s
+++ /dev/null
@@ -1,178 +0,0 @@
-#if defined(__ppc64__)
-#define MODE_CHOICE(x, y) y
-#else
-#define MODE_CHOICE(x, y) x
-#endif
-
-#define machine_choice	MODE_CHOICE(ppc7400,ppc64)
-
-; Define some pseudo-opcodes for size-independent load & store of GPRs ...
-#define lgu		MODE_CHOICE(lwzu, ldu)
-#define lg		MODE_CHOICE(lwz,ld)
-#define sg		MODE_CHOICE(stw,std)
-#define sgu		MODE_CHOICE(stwu,stdu)
-
-; ... and the size of GPRs and their storage indicator.
-#define GPR_BYTES	MODE_CHOICE(4,8)
-#define LOG2_GPR_BYTES	MODE_CHOICE(2,3)	/* log2(GPR_BYTES) */
-#define g_long		MODE_CHOICE(long, quad)	/* usage is ".g_long" */
-
-; From the ABI doc: "Mac OS X ABI Function Call Guide" Version 2009-02-04.
-#define LINKAGE_SIZE	MODE_CHOICE(24,48)
-#define PARAM_AREA	MODE_CHOICE(32,64)
-#define SAVED_LR_OFFSET	MODE_CHOICE(8,16)	/* save position for lr */
-
-; The whole stack frame **MUST** be 16byte-aligned.
-#define SAVE_SIZE (LINKAGE_SIZE+PARAM_AREA)
-
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
-; We no longer need the pic symbol stub for Darwin >= 9.
-#define BLGCP1	_GC_push_one
-#undef WANT_STUB
-#else
-#define BLGCP1	L_GC_push_one$stub
-#define WANT_STUB
-#endif
-
-	.machine machine_choice
-
-; GC_push_regs function. Under some optimization levels GCC will clobber
-; some of the non-volatile registers before we get a chance to save them
-; therefore, this cannot be inline asm.
-
-.text
-	.align LOG2_GPR_BYTES
-	.globl _GC_push_regs
-_GC_push_regs:
-    
-    ; Prolog
-	mflr r0
-	sg r0,SAVED_LR_OFFSET(r1)
-	sgu r1,-SAVE_SIZE(r1)
-
-L_body:
-    ; 'Push' r13-r31
-	mr r3,r13
-	bl BLGCP1
-	mr r3,r14
-	bl BLGCP1
-	mr r3,r15
-	bl BLGCP1
-	mr r3,r16
-	bl BLGCP1
-	mr r3,r17
-	bl BLGCP1
-	mr r3,r18
-	bl BLGCP1
-	mr r3,r19
-	bl BLGCP1
-	mr r3,r20
-	bl BLGCP1
-	mr r3,r21
-	bl BLGCP1
-	mr r3,r22
-	bl BLGCP1
-	mr r3,r23
-	bl BLGCP1
-	mr r3,r24
-	bl BLGCP1
-	mr r3,r25
-	bl BLGCP1
-	mr r3,r26
-	bl BLGCP1
-	mr r3,r27
-	bl BLGCP1
-	mr r3,r28
-	bl BLGCP1
-	mr r3,r29
-	bl BLGCP1
-	mr r3,r30
-	bl BLGCP1
-	mr r3,r31
-	bl BLGCP1
-
-L_epilog:
-    ; Epilog
-	lg r0,SAVE_SIZE+SAVED_LR_OFFSET(r1)
-	addi r1,r1,SAVE_SIZE
-	mtlr r0
-    	
-    ; Return
-	blr
-LFE0:
-
-; eh frames, for those that want 'em.
-
-#define EH_DATA_ALIGN_FACT MODE_CHOICE(0x7c,0x78)
-#define EH_FRAME_OFFSET MODE_CHOICE(0x40,0x70)
-
-	.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
-EH_frame1:
-	.set L$set$0,LECIE1-LSCIE1
-	.long L$set$0	; Length of Common Information Entry
-LSCIE1:
-	.long	0	; CIE Identifier Tag
-	.byte	0x1	; CIE Version
-	.ascii "zR\0"	; CIE Augmentation
-	.byte	0x1	; uleb128 0x1; CIE Code Alignment Factor
-	.byte	EH_DATA_ALIGN_FACT	; sleb128 -4/-8; CIE Data Alignment Factor
-	.byte	0x41	; CIE RA Column
-	.byte	0x1	; uleb128 0x1; Augmentation size
-	.byte	0x10	; FDE Encoding (pcrel)
-	.byte	0xc	; DW_CFA_def_cfa
-	.byte	0x1	; uleb128 0x1
-	.byte	0	; uleb128 0
-	.align	LOG2_GPR_BYTES
-LECIE1:
-
-	.globl _GC_push_regs.eh
-_GC_push_regs.eh:
-LSFDE1:
-	.set L$set$1,LEFDE1-LASFDE1
-	.long L$set$1	; FDE Length
-LASFDE1:
-	.long	LASFDE1-EH_frame1	; FDE CIE offset
-	.g_long	_GC_push_regs-.	; FDE initial location
-	.set L$set$2,LFE0-_GC_push_regs
-	.g_long L$set$2	; FDE address range
-	.byte	0	; uleb128 0; Augmentation size
-	.byte	0x4	; DW_CFA_advance_loc4
-	.set L$set$3,L_body-_GC_push_regs
-	.long L$set$3
-	.byte	0xe	; DW_CFA_def_cfa_offset
-	.byte	EH_FRAME_OFFSET	; uleb128 0x40/0x70
-	.byte	0x11	; DW_CFA_offset_extended_sf
-	.byte	0x41	; uleb128 0x41
-	.byte	0x7e	; sleb128 -2
-	.byte	0x4	; DW_CFA_advance_loc4
-	.set L$set$4,L_epilog-L_body
-	.long L$set$4
-	.byte	0xe	; DW_CFA_def_cfa_offset
-	.byte	0	; uleb128 0
-	.align	LOG2_GPR_BYTES
-LEFDE1:
-
-	.data
-#ifdef WANT_STUB
-; PIC stub stuff, generated by GCC
-
-	.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32
-	.align LOG2_GPR_BYTES
-L_GC_push_one$stub:
-	.indirect_symbol _GC_push_one
-	mflr r0
-	bcl 20,31,L0$_GC_push_one
-L0$_GC_push_one:
-	mflr r11
-	addis r11,r11,ha16(L_GC_push_one$lazy_ptr-L0$_GC_push_one)
-	mtlr r0
-	lgu r12,lo16(L_GC_push_one$lazy_ptr-L0$_GC_push_one)(r11)
-	mtctr r12
-	bctr
-
-	.data
-	.lazy_symbol_pointer
-L_GC_push_one$lazy_ptr:
-	.indirect_symbol _GC_push_one
-	.g_long dyld_stub_binding_helper
-#endif
diff --git a/boehm-gc/pthread_stop_world.c b/boehm-gc/pthread_stop_world.c
deleted file mode 100644
index bc3c901dccf..00000000000
--- a/boehm-gc/pthread_stop_world.c
+++ /dev/null
@@ -1,580 +0,0 @@
-#include "private/pthread_support.h"
-
-#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-     && !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
-
-#include <signal.h>
-#include <semaphore.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/time.h>
-#ifndef HPUX
-# include <sys/select.h>
-  /* Doesn't exist on HP/UX 11.11. */
-#endif
-
-void suspend_self();
-
-#if DEBUG_THREADS
-
-#ifndef NSIG
-# if defined(MAXSIG)
-#  define NSIG (MAXSIG+1)
-# elif defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__SIGRTMAX)
-#  define NSIG (__SIGRTMAX+1)
-# else
-  --> please fix it
-# endif
-#endif
-
-void GC_print_sig_mask()
-{
-    sigset_t blocked;
-    int i;
-
-    if (pthread_sigmask(SIG_BLOCK, NULL, &blocked) != 0)
-    	ABORT("pthread_sigmask");
-    GC_printf0("Blocked: ");
-    for (i = 1; i < NSIG; i++) {
-        if (sigismember(&blocked, i)) { GC_printf1("%ld ",(long) i); }
-    }
-    GC_printf0("\n");
-}
-
-#endif
-
-/* Remove the signals that we want to allow in thread stopping 	*/
-/* handler from a set.						*/
-void GC_remove_allowed_signals(sigset_t *set)
-{
-#   ifdef NO_SIGNALS
-      if (sigdelset(set, SIGINT) != 0
-	  || sigdelset(set, SIGQUIT) != 0
-	  || sigdelset(set, SIGABRT) != 0
-	  || sigdelset(set, SIGTERM) != 0) {
-        ABORT("sigdelset() failed");
-      }
-#   endif
-
-#   ifdef MPROTECT_VDB
-      /* Handlers write to the thread structure, which is in the heap,	*/
-      /* and hence can trigger a protection fault.			*/
-      if (sigdelset(set, SIGSEGV) != 0
-#	  ifdef SIGBUS
-	    || sigdelset(set, SIGBUS) != 0
-# 	  endif
-	  ) {
-        ABORT("sigdelset() failed");
-      }
-#   endif
-}
-
-static sigset_t suspend_handler_mask;
-
-volatile sig_atomic_t GC_stop_count;
-			/* Incremented at the beginning of GC_stop_world. */
-
-volatile sig_atomic_t GC_world_is_stopped = FALSE;
-			/* FALSE ==> it is safe for threads to restart, i.e. */
-			/* they will see another suspend signal before they  */
-			/* are expected to stop (unless they have voluntarily */
-			/* stopped).					     */
-
-void GC_brief_async_signal_safe_sleep()
-{
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 1000 * TIME_LIMIT / 2;
-    select(0, 0, 0, 0, &tv);
-}
-
-#ifdef GC_OSF1_THREADS
-  GC_bool GC_retry_signals = TRUE;
-#else
-  GC_bool GC_retry_signals = FALSE;
-#endif
-
-/*
- * We use signals to stop threads during GC.
- * 
- * Suspended threads wait in signal handler for SIG_THR_RESTART.
- * That's more portable than semaphores or condition variables.
- * (We do use sem_post from a signal handler, but that should be portable.)
- *
- * The thread suspension signal SIG_SUSPEND is now defined in gc_priv.h.
- * Note that we can't just stop a thread; we need it to save its stack
- * pointer(s) and acknowledge.
- */
-
-#ifndef SIG_THR_RESTART
-#  if defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS)
-#    ifdef _SIGRTMIN
-#      define SIG_THR_RESTART _SIGRTMIN + 5
-#    else
-#      define SIG_THR_RESTART SIGRTMIN + 5
-#    endif
-#  else
-#   define SIG_THR_RESTART SIGXCPU
-#  endif
-#endif
-
-sem_t GC_suspend_ack_sem;
-
-void GC_suspend_handler_inner(ptr_t sig_arg);
-
-#if defined(IA64) || defined(HP_PA) || defined(M68K)
-extern void GC_with_callee_saves_pushed();
-
-void GC_suspend_handler(int sig)
-{
-  GC_thread me = GC_lookup_thread (pthread_self());
-  if (me -> flags & SUSPENDED)
-    suspend_self();
-  else {
-    int old_errno = errno;
-    GC_with_callee_saves_pushed(GC_suspend_handler_inner, (ptr_t)(word)sig);
-    errno = old_errno;
-  }
-}
-
-#else
-/* We believe that in all other cases the full context is already	*/
-/* in the signal handler frame.						*/
-void GC_suspend_handler(int sig)
-{
-  GC_thread me = GC_lookup_thread(pthread_self());
-  if (me -> flags & SUSPENDED)
-    suspend_self();
-  else {
-    int old_errno = errno;
-    GC_suspend_handler_inner((ptr_t)(word)sig);
-    errno = old_errno;
-  }
-}
-#endif
-
-void GC_suspend_handler_inner(ptr_t sig_arg)
-{
-    int sig = (int)(word)sig_arg;
-    int dummy;
-    pthread_t my_thread = pthread_self();
-    GC_thread me;
-#   ifdef PARALLEL_MARK
-	word my_mark_no = GC_mark_no;
-	/* Marker can't proceed until we acknowledge.  Thus this is	*/
-	/* guaranteed to be the mark_no correspending to our 		*/
-	/* suspension, i.e. the marker can't have incremented it yet.	*/
-#   endif
-    word my_stop_count = GC_stop_count;
-
-    if (sig != SIG_SUSPEND) ABORT("Bad signal in suspend_handler");
-
-#if DEBUG_THREADS
-    GC_printf1("Suspending 0x%lx\n", my_thread);
-#endif
-
-    me = GC_lookup_thread(my_thread);
-    /* The lookup here is safe, since I'm doing this on behalf  */
-    /* of a thread which holds the allocation lock in order	*/
-    /* to stop the world.  Thus concurrent modification of the	*/
-    /* data structure is impossible.				*/
-    if (me -> stop_info.last_stop_count == my_stop_count) {
-	/* Duplicate signal.  OK if we are retrying.	*/
-	if (!GC_retry_signals) {
-	    WARN("Duplicate suspend signal in thread %lx\n",
-		 pthread_self());
-	}
-	return;
-    }
-#   ifdef SPARC
-	me -> stop_info.stack_ptr = (ptr_t)GC_save_regs_in_stack();
-#   else
-	me -> stop_info.stack_ptr = (ptr_t)(&dummy);
-#   endif
-#   ifdef IA64
-	me -> backing_store_ptr = (ptr_t)GC_save_regs_in_stack();
-#   endif
-
-    /* Tell the thread that wants to stop the world that this   */
-    /* thread has been stopped.  Note that sem_post() is  	*/
-    /* the only async-signal-safe primitive in LinuxThreads.    */
-    sem_post(&GC_suspend_ack_sem);
-    me -> stop_info.last_stop_count = my_stop_count;
-
-    /* Wait until that thread tells us to restart by sending    */
-    /* this thread a SIG_THR_RESTART signal.			*/
-    /* SIG_THR_RESTART should be masked at this point.  Thus there	*/
-    /* is no race.						*/
-    /* We do not continue until we receive a SIG_THR_RESTART,	*/
-    /* but we do not take that as authoritative.  (We may be	*/
-    /* accidentally restarted by one of the user signals we 	*/
-    /* don't block.)  After we receive the signal, we use a 	*/
-    /* primitive and expensive mechanism to wait until it's	*/
-    /* really safe to proceed.  Under normal circumstances,	*/
-    /* this code should not be executed.			*/
-    sigsuspend(&suspend_handler_mask);        /* Wait for signal */
-    while (GC_world_is_stopped && GC_stop_count == my_stop_count) {
-        GC_brief_async_signal_safe_sleep();
-#       if DEBUG_THREADS
-	  GC_err_printf0("Sleeping in signal handler");
-#       endif
-    }
-    /* If the RESTART signal gets lost, we can still lose.  That should be  */
-    /* less likely than losing the SUSPEND signal, since we don't do much   */
-    /* between the sem_post and sigsuspend.	   			    */
-    /* We'd need more handshaking to work around that.			    */
-    /* Simply dropping the sigsuspend call should be safe, but is unlikely  */
-    /* to be efficient.							    */
-
-#if DEBUG_THREADS
-    GC_printf1("Continuing 0x%lx\n", my_thread);
-#endif
-}
-
-void GC_restart_handler(int sig)
-{
-    pthread_t my_thread = pthread_self();
-
-    if (sig != SIG_THR_RESTART) ABORT("Bad signal in suspend_handler");
-
-    /*
-    ** Note: even if we don't do anything useful here,
-    ** it would still be necessary to have a signal handler,
-    ** rather than ignoring the signals, otherwise
-    ** the signals will not be delivered at all, and
-    ** will thus not interrupt the sigsuspend() above.
-    */
-
-#if DEBUG_THREADS
-    GC_printf1("In GC_restart_handler for 0x%lx\n", pthread_self());
-#endif
-}
-
-# ifdef IA64
-#   define IF_IA64(x) x
-# else
-#   define IF_IA64(x)
-# endif
-/* We hold allocation lock.  Should do exactly the right thing if the	*/
-/* world is stopped.  Should not fail if it isn't.			*/
-void GC_push_all_stacks()
-{
-    GC_bool found_me = FALSE;
-    int i;
-    GC_thread p;
-    ptr_t lo, hi;
-    /* On IA64, we also need to scan the register backing store. */
-    IF_IA64(ptr_t bs_lo; ptr_t bs_hi;)
-    pthread_t me = pthread_self();
-    
-    if (!GC_thr_initialized) GC_thr_init();
-    #if DEBUG_THREADS
-        GC_printf1("Pushing stacks from thread 0x%lx\n", (unsigned long) me);
-    #endif
-    for (i = 0; i < THREAD_TABLE_SZ; i++) {
-      for (p = GC_threads[i]; p != 0; p = p -> next) {
-        if (p -> flags & FINISHED) continue;
-        if (pthread_equal(p -> id, me)) {
-#  	    ifdef SPARC
-	        lo = (ptr_t)GC_save_regs_in_stack();
-#  	    else
- 	        lo = GC_approx_sp();
-#           endif
-	    found_me = TRUE;
-	    IF_IA64(bs_hi = (ptr_t)GC_save_regs_in_stack();)
-	} else {
-	    lo = p -> stop_info.stack_ptr;
-	    IF_IA64(bs_hi = p -> backing_store_ptr;)
-	}
-        if ((p -> flags & MAIN_THREAD) == 0) {
-	    hi = p -> stack_end;
-	    IF_IA64(bs_lo = p -> backing_store_end);
-        } else {
-            /* The original stack. */
-            hi = GC_stackbottom;
-	    IF_IA64(bs_lo = BACKING_STORE_BASE;)
-        }
-        #if DEBUG_THREADS
-            GC_printf3("Stack for thread 0x%lx = [%lx,%lx)\n",
-    	        (unsigned long) p -> id,
-		(unsigned long) lo, (unsigned long) hi);
-        #endif
-	if (0 == lo) ABORT("GC_push_all_stacks: sp not set!\n");
-#       ifdef STACK_GROWS_UP
-	  /* We got them backwards! */
-          GC_push_all_stack(hi, lo);
-#       else
-          GC_push_all_stack(lo, hi);
-#	endif
-#	ifdef IA64
-#         if DEBUG_THREADS
-            GC_printf3("Reg stack for thread 0x%lx = [%lx,%lx)\n",
-    	        (unsigned long) p -> id,
-		(unsigned long) bs_lo, (unsigned long) bs_hi);
-#	  endif
-          if (pthread_equal(p -> id, me)) {
-	    GC_push_all_eager(bs_lo, bs_hi);
-	  } else {
-	    GC_push_all_stack(bs_lo, bs_hi);
-	  }
-#	endif
-      }
-    }
-    if (!found_me && !GC_in_thread_creation)
-      ABORT("Collecting from unknown thread.");
-}
-
-/* There seems to be a very rare thread stopping problem.  To help us  */
-/* debug that, we save the ids of the stopping thread. */
-pthread_t GC_stopping_thread;
-int GC_stopping_pid;
-
-/* We hold the allocation lock.  Suspend all threads that might	*/
-/* still be running.  Return the number of suspend signals that	*/
-/* were sent. */
-int GC_suspend_all()
-{
-    int n_live_threads = 0;
-    int i;
-    GC_thread p;
-    int result;
-    pthread_t my_thread = pthread_self();
-    
-    GC_stopping_thread = my_thread;    /* debugging only.      */
-    GC_stopping_pid = getpid();                /* debugging only.      */
-    for (i = 0; i < THREAD_TABLE_SZ; i++) {
-      for (p = GC_threads[i]; p != 0; p = p -> next) {
-        if (p -> id != my_thread) {
-            if (p -> flags & FINISHED) continue;
-            if (p -> stop_info.last_stop_count == GC_stop_count) continue;
-	    if (p -> thread_blocked) /* Will wait */ continue;
-            n_live_threads++;
-	    #if DEBUG_THREADS
-	      GC_printf1("Sending suspend signal to 0x%lx\n", p -> id);
-	    #endif
-        
-        result = pthread_kill(p -> id, SIG_SUSPEND);
-	    switch(result) {
-                case ESRCH:
-                    /* Not really there anymore.  Possible? */
-                    n_live_threads--;
-                    break;
-                case 0:
-                    break;
-                default:
-                    ABORT("pthread_kill failed");
-            }
-        }
-      }
-    }
-    return n_live_threads;
-}
-
-/* Caller holds allocation lock.	*/
-void GC_stop_world()
-{
-    int i;
-    int n_live_threads;
-    int code;
-
-    #if DEBUG_THREADS
-    GC_printf1("Stopping the world from 0x%lx\n", pthread_self());
-    #endif
-       
-    /* Make sure all free list construction has stopped before we start. */
-    /* No new construction can start, since free list construction is	*/
-    /* required to acquire and release the GC lock before it starts,	*/
-    /* and we have the lock.						*/
-#   ifdef PARALLEL_MARK
-      GC_acquire_mark_lock();
-      GC_ASSERT(GC_fl_builder_count == 0);
-      /* We should have previously waited for it to become zero. */
-#   endif /* PARALLEL_MARK */
-    ++GC_stop_count;
-    GC_world_is_stopped = TRUE;
-    n_live_threads = GC_suspend_all();
-
-      if (GC_retry_signals) {
-	  unsigned long wait_usecs = 0;  /* Total wait since retry.	*/
-#	  define WAIT_UNIT 3000
-#	  define RETRY_INTERVAL 100000
-	  for (;;) {
-	      int ack_count;
-
-	      sem_getvalue(&GC_suspend_ack_sem, &ack_count);
-	      if (ack_count == n_live_threads) break;
-	      if (wait_usecs > RETRY_INTERVAL) {
-		  int newly_sent = GC_suspend_all();
-
-#                 ifdef CONDPRINT
-		    if (GC_print_stats) {
-		      GC_printf1("Resent %ld signals after timeout\n",
-				 newly_sent);
-		    }
-#                 endif
-		  sem_getvalue(&GC_suspend_ack_sem, &ack_count);
-		  if (newly_sent < n_live_threads - ack_count) {
-		      WARN("Lost some threads during GC_stop_world?!\n",0);
-		      n_live_threads = ack_count + newly_sent;
-		  }
-		  wait_usecs = 0;
-	      }
-	      usleep(WAIT_UNIT);
-	      wait_usecs += WAIT_UNIT;
-	  }
-      }
-    for (i = 0; i < n_live_threads; i++) {
-	  while (0 != (code = sem_wait(&GC_suspend_ack_sem))) {
-	      if (errno != EINTR) {
-	         GC_err_printf1("Sem_wait returned %ld\n", (unsigned long)code);
-	         ABORT("sem_wait for handler failed");
-	      }
-	  }
-    }
-#   ifdef PARALLEL_MARK
-      GC_release_mark_lock();
-#   endif
-    #if DEBUG_THREADS
-      GC_printf1("World stopped from 0x%lx\n", pthread_self());
-    #endif
-    GC_stopping_thread = 0;  /* debugging only */
-}
-
-void suspend_self() {
-  GC_thread me = GC_lookup_thread(pthread_self());
-  if (me == NULL)
-    ABORT("attempting to suspend unknown thread");
-
-  me -> flags |= SUSPENDED;
-  GC_start_blocking();
-  while (me -> flags & SUSPENDED)
-    GC_brief_async_signal_safe_sleep();
-  GC_end_blocking();
-}
-
-void GC_suspend_thread(pthread_t thread) {
-  if (thread == pthread_self())
-    suspend_self();
-  else {
-    int result;
-    GC_thread t = GC_lookup_thread(thread);
-    if (t == NULL)
-      ABORT("attempting to suspend unknown thread");
-
-    t -> flags |= SUSPENDED;
-    result = pthread_kill (t -> id, SIG_SUSPEND);
-    switch (result) {
-    case ESRCH:
-    case 0:
-      break;
-    default:
-      ABORT("pthread_kill failed");
-    }
-  }
-}
-
-void GC_resume_thread(pthread_t thread) {
-  GC_thread t = GC_lookup_thread(thread);
-  if (t == NULL)
-    ABORT("attempting to resume unknown thread");
-
-  t -> flags &= ~SUSPENDED;
-}
-
-int GC_is_thread_suspended(pthread_t thread) {
-  GC_thread t = GC_lookup_thread(thread);
-  if (t == NULL)
-    ABORT("querying suspension state of unknown thread");
-
-  return (t -> flags & SUSPENDED);
-}
-
-/* Caller holds allocation lock, and has held it continuously since	*/
-/* the world stopped.							*/
-void GC_start_world()
-{
-    pthread_t my_thread = pthread_self();
-    register int i;
-    register GC_thread p;
-    register int n_live_threads = 0;
-    register int result;
-
-#   if DEBUG_THREADS
-      GC_printf0("World starting\n");
-#   endif
-
-    GC_world_is_stopped = FALSE;
-    for (i = 0; i < THREAD_TABLE_SZ; i++) {
-      for (p = GC_threads[i]; p != 0; p = p -> next) {
-        if (p -> id != my_thread) {
-            if (p -> flags & FINISHED) continue;
-	    if (p -> thread_blocked) continue;
-            n_live_threads++;
-	    #if DEBUG_THREADS
-	      GC_printf1("Sending restart signal to 0x%lx\n", p -> id);
-	    #endif
-            result = pthread_kill(p -> id, SIG_THR_RESTART);
-	    switch(result) {
-                case ESRCH:
-                    /* Not really there anymore.  Possible? */
-                    n_live_threads--;
-                    break;
-                case 0:
-                    break;
-                default:
-                    ABORT("pthread_kill failed");
-            }
-        }
-      }
-    }
-    #if DEBUG_THREADS
-      GC_printf0("World started\n");
-    #endif
-}
-
-void GC_stop_init() {
-    struct sigaction act;
-    
-    if (sem_init(&GC_suspend_ack_sem, 0, 0) != 0)
-        ABORT("sem_init failed");
-
-    act.sa_flags = SA_RESTART;
-    if (sigfillset(&act.sa_mask) != 0) {
-    	ABORT("sigfillset() failed");
-    }
-    GC_remove_allowed_signals(&act.sa_mask);
-    /* SIG_THR_RESTART is set in the resulting mask.		*/
-    /* It is unmasked by the handler when necessary. 		*/
-    act.sa_handler = GC_suspend_handler;
-    if (sigaction(SIG_SUSPEND, &act, NULL) != 0) {
-    	ABORT("Cannot set SIG_SUSPEND handler");
-    }
-
-    act.sa_handler = GC_restart_handler;
-    if (sigaction(SIG_THR_RESTART, &act, NULL) != 0) {
-    	ABORT("Cannot set SIG_THR_RESTART handler");
-    }
-
-    /* Inititialize suspend_handler_mask. It excludes SIG_THR_RESTART. */
-      if (sigfillset(&suspend_handler_mask) != 0) ABORT("sigfillset() failed");
-      GC_remove_allowed_signals(&suspend_handler_mask);
-      if (sigdelset(&suspend_handler_mask, SIG_THR_RESTART) != 0)
-	  ABORT("sigdelset() failed");
-
-    /* Check for GC_RETRY_SIGNALS.	*/
-      if (0 != GETENV("GC_RETRY_SIGNALS")) {
-	  GC_retry_signals = TRUE;
-      }
-      if (0 != GETENV("GC_NO_RETRY_SIGNALS")) {
-	  GC_retry_signals = FALSE;
-      }
-#     ifdef CONDPRINT
-          if (GC_print_stats && GC_retry_signals) {
-              GC_printf0("Will retry suspend signal if necessary.\n");
-	  }
-#     endif
-}
-
-#endif
diff --git a/boehm-gc/pthread_support.c b/boehm-gc/pthread_support.c
deleted file mode 100644
index 6d8f020e076..00000000000
--- a/boehm-gc/pthread_support.c
+++ /dev/null
@@ -1,1715 +0,0 @@
-/* 
- * Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1998 by Fergus Henderson.  All rights reserved.
- * Copyright (c) 2000-2004 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/*
- * Support code for LinuxThreads, the clone()-based kernel
- * thread package for Linux which is included in libc6.
- *
- * This code relies on implementation details of LinuxThreads,
- * (i.e. properties not guaranteed by the Pthread standard),
- * though this version now does less of that than the other Pthreads
- * support code.
- *
- * Note that there is a lot of code duplication between linux_threads.c
- * and thread support for some of the other Posix platforms; any changes
- * made here may need to be reflected there too.
- */
- /* DG/UX ix86 support <takis@xfree86.org> */
-/*
- * Linux_threads.c now also includes some code to support HPUX and
- * OSF1 (Compaq Tru64 Unix, really).  The OSF1 support is based on Eric Benson's
- * patch.
- *
- * Eric also suggested an alternate basis for a lock implementation in
- * his code:
- * + #elif defined(OSF1)
- * +    unsigned long GC_allocate_lock = 0;
- * +    msemaphore GC_allocate_semaphore;
- * + #  define GC_TRY_LOCK() \
- * +    ((msem_lock(&GC_allocate_semaphore, MSEM_IF_NOWAIT) == 0) \
- * +     ? (GC_allocate_lock = 1) \
- * +     : 0)
- * + #  define GC_LOCK_TAKEN GC_allocate_lock
- */
-
-/*#define DEBUG_THREADS 1*/
-/*#define GC_ASSERTIONS*/
-
-#include "gc_config.h"
-
-#ifdef GC_PTHREAD_SYM_VERSION
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#endif
-
-# include "gc.h"
-# include "private/pthread_support.h"
-
-# if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-     && !defined(GC_WIN32_THREADS)
-
-# if defined(GC_HPUX_THREADS) && !defined(USE_PTHREAD_SPECIFIC) \
-     && !defined(USE_COMPILER_TLS)
-#   ifdef __GNUC__
-#     define USE_PTHREAD_SPECIFIC
-      /* Empirically, as of gcc 3.3, USE_COMPILER_TLS doesn't work.	*/
-#   else
-#     define USE_COMPILER_TLS
-#   endif
-# endif
-
-# if defined USE_HPUX_TLS
-    --> Macro replaced by USE_COMPILER_TLS
-# endif
-
-# if (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \
-      defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)) \
-      && !defined(USE_PTHREAD_SPECIFIC)
-#   define USE_PTHREAD_SPECIFIC
-# endif
-
-# if defined(GC_DGUX386_THREADS) && !defined(_POSIX4A_DRAFT10_SOURCE)
-#   define _POSIX4A_DRAFT10_SOURCE 1
-# endif
-
-# if defined(GC_DGUX386_THREADS) && !defined(_USING_POSIX4A_DRAFT10)
-#   define _USING_POSIX4A_DRAFT10 1
-# endif
-
-# ifdef THREAD_LOCAL_ALLOC
-#   if !defined(USE_PTHREAD_SPECIFIC) && !defined(USE_COMPILER_TLS)
-#     include "private/specific.h"
-#   endif
-#   if defined(USE_PTHREAD_SPECIFIC)
-#     define GC_getspecific pthread_getspecific
-#     define GC_setspecific pthread_setspecific
-#     define GC_key_create pthread_key_create
-      typedef pthread_key_t GC_key_t;
-#   endif
-#   if defined(USE_COMPILER_TLS)
-#     define GC_getspecific(x) (x)
-#     define GC_setspecific(key, v) ((key) = (v), 0)
-#     define GC_key_create(key, d) 0
-      typedef void * GC_key_t;
-#   endif
-# endif
-# include <stdlib.h>
-# include <pthread.h>
-# include <sched.h>
-# include <time.h>
-# include <errno.h>
-# include <unistd.h>
-# include <sys/mman.h>
-# include <sys/time.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <signal.h>
-
-#if defined(GC_DARWIN_THREADS)
-# include "private/darwin_semaphore.h"
-#else
-# include <semaphore.h>
-#endif /* !GC_DARWIN_THREADS */
-
-#if defined(GC_DARWIN_THREADS) || defined(GC_FREEBSD_THREADS)
-# include <sys/sysctl.h>
-#endif /* GC_DARWIN_THREADS */
-
-
-
-#if defined(GC_DGUX386_THREADS)
-# include <sys/dg_sys_info.h>
-# include <sys/_int_psem.h>
-  /* sem_t is an uint in DG/UX */
-  typedef unsigned int  sem_t;
-#endif /* GC_DGUX386_THREADS */
-
-#ifndef __GNUC__
-#   define __inline__
-#endif
-
-#ifdef GC_USE_LD_WRAP
-#   define WRAP_FUNC(f) __wrap_##f
-#   define REAL_FUNC(f) __real_##f
-#else
-#   define WRAP_FUNC(f) GC_##f
-#   if !defined(GC_DGUX386_THREADS)
-#     define REAL_FUNC(f) f
-#   else /* GC_DGUX386_THREADS */
-#     define REAL_FUNC(f) __d10_##f
-#   endif /* GC_DGUX386_THREADS */
-#   undef pthread_create
-#   if !defined(GC_DARWIN_THREADS)
-#     undef pthread_sigmask
-#   endif
-#   undef pthread_join
-#   undef pthread_detach
-#   if defined(GC_OSF1_THREADS) && defined(_PTHREAD_USE_MANGLED_NAMES_) \
-       && !defined(_PTHREAD_USE_PTDNAM_)
-/* Restore the original mangled names on Tru64 UNIX.  */
-#     define pthread_create __pthread_create
-#     define pthread_join __pthread_join
-#     define pthread_detach __pthread_detach
-#   endif
-#endif
-
-void GC_thr_init();
-
-static GC_bool parallel_initialized = FALSE;
-
-void GC_init_parallel();
-
-# if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
-
-/* We don't really support thread-local allocation with DBG_HDRS_ALL */
-
-#ifdef USE_COMPILER_TLS
-  __thread
-#endif
-GC_key_t GC_thread_key;
-
-static GC_bool keys_initialized;
-
-/* Recover the contents of the freelist array fl into the global one gfl.*/
-/* Note that the indexing scheme differs, in that gfl has finer size	*/
-/* resolution, even if not all entries are used.			*/
-/* We hold the allocator lock.						*/
-static void return_freelists(ptr_t *fl, ptr_t *gfl)
-{
-    int i;
-    ptr_t q, *qptr;
-    size_t nwords;
-
-    for (i = 1; i < NFREELISTS; ++i) {
-	nwords = i * (GRANULARITY/sizeof(word));
-        qptr = fl + i;	
-	q = *qptr;
-	if ((word)q >= HBLKSIZE) {
-	  if (gfl[nwords] == 0) {
-	    gfl[nwords] = q;
-	  } else {
-	    /* Concatenate: */
-	    for (; (word)q >= HBLKSIZE; qptr = &(obj_link(q)), q = *qptr);
-	    GC_ASSERT(0 == q);
-	    *qptr = gfl[nwords];
-	    gfl[nwords] = fl[i];
-	  }
-	}
-	/* Clear fl[i], since the thread structure may hang around.	*/
-	/* Do it in a way that is likely to trap if we access it.	*/
-	fl[i] = (ptr_t)HBLKSIZE;
-    }
-}
-
-/* We statically allocate a single "size 0" object. It is linked to	*/
-/* itself, and is thus repeatedly reused for all size 0 allocation	*/
-/* requests.  (Size 0 gcj allocation requests are incorrect, and	*/
-/* we arrange for those to fault asap.)					*/
-static ptr_t size_zero_object = (ptr_t)(&size_zero_object);
-
-/* Each thread structure must be initialized.	*/
-/* This call must be made from the new thread.	*/
-/* Caller holds allocation lock.		*/
-void GC_init_thread_local(GC_thread p)
-{
-    int i;
-
-    if (!keys_initialized) {
-	if (0 != GC_key_create(&GC_thread_key, 0)) {
-	    ABORT("Failed to create key for local allocator");
-        }
-	keys_initialized = TRUE;
-    }
-    if (0 != GC_setspecific(GC_thread_key, p)) {
-	ABORT("Failed to set thread specific allocation pointers");
-    }
-    for (i = 1; i < NFREELISTS; ++i) {
-	p -> ptrfree_freelists[i] = (ptr_t)1;
-	p -> normal_freelists[i] = (ptr_t)1;
-#	ifdef GC_GCJ_SUPPORT
-	  p -> gcj_freelists[i] = (ptr_t)1;
-#	endif
-    }   
-    /* Set up the size 0 free lists.	*/
-    p -> ptrfree_freelists[0] = (ptr_t)(&size_zero_object);
-    p -> normal_freelists[0] = (ptr_t)(&size_zero_object);
-#   ifdef GC_GCJ_SUPPORT
-        p -> gcj_freelists[0] = (ptr_t)(-1);
-#   endif
-}
-
-#ifdef GC_GCJ_SUPPORT
-  extern ptr_t * GC_gcjobjfreelist;
-#endif
-
-/* We hold the allocator lock.	*/
-void GC_destroy_thread_local(GC_thread p)
-{
-    /* We currently only do this from the thread itself or from	*/
-    /* the fork handler for a child process.			*/
-#   ifndef HANDLE_FORK
-      GC_ASSERT(GC_getspecific(GC_thread_key) == (void *)p);
-#   endif
-    return_freelists(p -> ptrfree_freelists, GC_aobjfreelist);
-    return_freelists(p -> normal_freelists, GC_objfreelist);
-#   ifdef GC_GCJ_SUPPORT
-   	return_freelists(p -> gcj_freelists, GC_gcjobjfreelist);
-#   endif
-}
-
-extern GC_PTR GC_generic_malloc_many();
-
-GC_PTR GC_local_malloc(size_t bytes)
-{
-    if (EXPECT(!SMALL_ENOUGH(bytes),0)) {
-        return(GC_malloc(bytes));
-    } else {
-	int index = INDEX_FROM_BYTES(bytes);
-	ptr_t * my_fl;
-	ptr_t my_entry;
-#	if defined(REDIRECT_MALLOC) && !defined(USE_PTHREAD_SPECIFIC)
-	GC_key_t k = GC_thread_key;
-#	endif
-	void * tsd;
-
-#	if defined(REDIRECT_MALLOC) && !defined(USE_PTHREAD_SPECIFIC)
-	    if (EXPECT(0 == k, 0)) {
-		/* This can happen if we get called when the world is	*/
-		/* being initialized.  Whether we can actually complete	*/
-		/* the initialization then is unclear.			*/
-		GC_init_parallel();
-		k = GC_thread_key;
-	    }
-#	endif
-	tsd = GC_getspecific(GC_thread_key);
-#	ifdef GC_ASSERTIONS
-	  LOCK();
-	  GC_ASSERT(tsd == (void *)GC_lookup_thread(pthread_self()));
-	  UNLOCK();
-#	endif
-	my_fl = ((GC_thread)tsd) -> normal_freelists + index;
-	my_entry = *my_fl;
-	if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
-	    ptr_t next = obj_link(my_entry);
-	    GC_PTR result = (GC_PTR)my_entry;
-	    *my_fl = next;
-	    obj_link(my_entry) = 0;
-	    PREFETCH_FOR_WRITE(next);
-	    return result;
-	} else if ((word)my_entry - 1 < DIRECT_GRANULES) {
-	    *my_fl = my_entry + index + 1;
-            return GC_malloc(bytes);
-	} else {
-	    GC_generic_malloc_many(BYTES_FROM_INDEX(index), NORMAL, my_fl);
-	    if (*my_fl == 0) return GC_oom_fn(bytes);
-	    return GC_local_malloc(bytes);
-	}
-    }
-}
-
-GC_PTR GC_local_malloc_atomic(size_t bytes)
-{
-    if (EXPECT(!SMALL_ENOUGH(bytes), 0)) {
-        return(GC_malloc_atomic(bytes));
-    } else {
-	int index = INDEX_FROM_BYTES(bytes);
-	ptr_t * my_fl = ((GC_thread)GC_getspecific(GC_thread_key))
-		        -> ptrfree_freelists + index;
-	ptr_t my_entry = *my_fl;
-    
-	if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
-	    GC_PTR result = (GC_PTR)my_entry;
-	    *my_fl = obj_link(my_entry);
-	    return result;
-	} else if ((word)my_entry - 1 < DIRECT_GRANULES) {
-	    *my_fl = my_entry + index + 1;
-        return GC_malloc_atomic(bytes);
-	} else {
-	    GC_generic_malloc_many(BYTES_FROM_INDEX(index), PTRFREE, my_fl);
-	    /* *my_fl is updated while the collector is excluded;	*/
-	    /* the free list is always visible to the collector as 	*/
-	    /* such.							*/
-	    if (*my_fl == 0) return GC_oom_fn(bytes);
-	    return GC_local_malloc_atomic(bytes);
-	}
-    }
-}
-
-#ifdef GC_GCJ_SUPPORT
-
-#include "include/gc_gcj.h"
-
-#ifdef GC_ASSERTIONS
-  extern GC_bool GC_gcj_malloc_initialized;
-#endif
-
-extern int GC_gcj_kind;
-
-GC_PTR GC_local_gcj_malloc(size_t bytes,
-			   void * ptr_to_struct_containing_descr)
-{
-    GC_ASSERT(GC_gcj_malloc_initialized);
-    if (EXPECT(!SMALL_ENOUGH(bytes), 0)) {
-        return GC_gcj_malloc(bytes, ptr_to_struct_containing_descr);
-    } else {
-	int index = INDEX_FROM_BYTES(bytes);
-	ptr_t * my_fl = ((GC_thread)GC_getspecific(GC_thread_key))
-	                -> gcj_freelists + index;
-	ptr_t my_entry = *my_fl;
-	if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
-	    GC_PTR result = (GC_PTR)my_entry;
-	    GC_ASSERT(!GC_incremental);
-	    /* We assert that any concurrent marker will stop us.	*/
-	    /* Thus it is impossible for a mark procedure to see the 	*/
-	    /* allocation of the next object, but to see this object 	*/
-	    /* still containing a free list pointer.  Otherwise the 	*/
-	    /* marker might find a random "mark descriptor".		*/
-	    *(volatile ptr_t *)my_fl = obj_link(my_entry);
-	    /* We must update the freelist before we store the pointer.	*/
-	    /* Otherwise a GC at this point would see a corrupted	*/
-	    /* free list.						*/
-	    /* A memory barrier is probably never needed, since the 	*/
-	    /* action of stopping this thread will cause prior writes	*/
-	    /* to complete.						*/
-	    GC_ASSERT(((void * volatile *)result)[1] == 0); 
-	    *(void * volatile *)result = ptr_to_struct_containing_descr; 
-	    return result;
-	} else if ((word)my_entry - 1 < DIRECT_GRANULES) {
-	    if (!GC_incremental) *my_fl = my_entry + index + 1;
-	    	/* In the incremental case, we always have to take this */
-	    	/* path.  Thus we leave the counter alone.		*/
-            return GC_gcj_malloc(bytes, ptr_to_struct_containing_descr);
-	} else {
-	    GC_generic_malloc_many(BYTES_FROM_INDEX(index), GC_gcj_kind, my_fl);
-	    if (*my_fl == 0) return GC_oom_fn(bytes);
-	    return GC_local_gcj_malloc(bytes, ptr_to_struct_containing_descr);
-	}
-    }
-}
-
-#endif /* GC_GCJ_SUPPORT */
-
-# else  /* !THREAD_LOCAL_ALLOC  && !DBG_HDRS_ALL */
-
-#   define GC_destroy_thread_local(t)
-
-# endif /* !THREAD_LOCAL_ALLOC */
-
-#if 0
-/*
-To make sure that we're using LinuxThreads and not some other thread
-package, we generate a dummy reference to `pthread_kill_other_threads_np'
-(was `__pthread_initial_thread_bos' but that disappeared),
-which is a symbol defined in LinuxThreads, but (hopefully) not in other
-thread packages.
-
-We no longer do this, since this code is now portable enough that it might
-actually work for something else.
-*/
-void (*dummy_var_to_force_linux_threads)() = pthread_kill_other_threads_np;
-#endif /* 0 */
-
-long GC_nprocs = 1;	/* Number of processors.  We may not have	*/
-			/* access to all of them, but this is as good	*/
-			/* a guess as any ...				*/
-
-#ifdef PARALLEL_MARK
-
-# ifndef MAX_MARKERS
-#   define MAX_MARKERS 16
-# endif
-
-static ptr_t marker_sp[MAX_MARKERS] = {0};
-
-void * GC_mark_thread(void * id)
-{
-  word my_mark_no = 0;
-
-  marker_sp[(word)id] = GC_approx_sp();
-  for (;; ++my_mark_no) {
-    /* GC_mark_no is passed only to allow GC_help_marker to terminate	*/
-    /* promptly.  This is important if it were called from the signal	*/
-    /* handler or from the GC lock acquisition code.  Under Linux, it's	*/
-    /* not safe to call it from a signal handler, since it uses mutexes	*/
-    /* and condition variables.  Since it is called only here, the 	*/
-    /* argument is unnecessary.						*/
-    if (my_mark_no < GC_mark_no || my_mark_no > GC_mark_no + 2) {
-	/* resynchronize if we get far off, e.g. because GC_mark_no	*/
-	/* wrapped.							*/
-	my_mark_no = GC_mark_no;
-    }
-#   ifdef DEBUG_THREADS
-	GC_printf1("Starting mark helper for mark number %ld\n", my_mark_no);
-#   endif
-    GC_help_marker(my_mark_no);
-  }
-}
-
-extern long GC_markers;		/* Number of mark threads we would	*/
-				/* like to have.  Includes the 		*/
-				/* initiating thread.			*/
-
-pthread_t GC_mark_threads[MAX_MARKERS];
-
-#define PTHREAD_CREATE REAL_FUNC(pthread_create)
-
-static void start_mark_threads()
-{
-    unsigned i;
-    pthread_attr_t attr;
-
-    if (GC_markers > MAX_MARKERS) {
-	WARN("Limiting number of mark threads\n", 0);
-	GC_markers = MAX_MARKERS;
-    }
-    if (0 != pthread_attr_init(&attr)) ABORT("pthread_attr_init failed");
-	
-    if (0 != pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED))
-	ABORT("pthread_attr_setdetachstate failed");
-
-#   if defined(HPUX) || defined(GC_DGUX386_THREADS)
-      /* Default stack size is usually too small: fix it. */
-      /* Otherwise marker threads or GC may run out of	  */
-      /* space.						  */
-#     define MIN_STACK_SIZE (8*HBLKSIZE*sizeof(word))
-      {
-	size_t old_size;
-	int code;
-
-        if (pthread_attr_getstacksize(&attr, &old_size) != 0)
-	  ABORT("pthread_attr_getstacksize failed\n");
-	if (old_size < MIN_STACK_SIZE) {
-	  if (pthread_attr_setstacksize(&attr, MIN_STACK_SIZE) != 0)
-		  ABORT("pthread_attr_setstacksize failed\n");
-	}
-      }
-#   endif /* HPUX || GC_DGUX386_THREADS */
-#   ifdef CONDPRINT
-      if (GC_print_stats) {
-	GC_printf1("Starting %ld marker threads\n", GC_markers - 1);
-      }
-#   endif
-    for (i = 0; i < GC_markers - 1; ++i) {
-      if (0 != PTHREAD_CREATE(GC_mark_threads + i, &attr,
-			      GC_mark_thread, (void *)(word)i)) {
-	WARN("Marker thread creation failed, errno = %ld.\n", errno);
-      }
-    }
-}
-
-#else  /* !PARALLEL_MARK */
-
-static __inline__ void start_mark_threads()
-{
-}
-
-#endif /* !PARALLEL_MARK */
-
-GC_bool GC_thr_initialized = FALSE;
-
-volatile GC_thread GC_threads[THREAD_TABLE_SZ];
-
-void GC_push_thread_structures GC_PROTO((void))
-{
-    GC_push_all((ptr_t)(GC_threads), (ptr_t)(GC_threads)+sizeof(GC_threads));
-#   if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
-      GC_push_all((ptr_t)(&GC_thread_key),
-	  (ptr_t)(&GC_thread_key)+sizeof(&GC_thread_key));
-#   endif
-}
-
-#ifdef THREAD_LOCAL_ALLOC
-/* We must explicitly mark ptrfree and gcj free lists, since the free 	*/
-/* list links wouldn't otherwise be found.  We also set them in the 	*/
-/* normal free lists, since that involves touching less memory than if	*/
-/* we scanned them normally.						*/
-void GC_mark_thread_local_free_lists(void)
-{
-    int i, j;
-    GC_thread p;
-    ptr_t q;
-    
-    for (i = 0; i < THREAD_TABLE_SZ; ++i) {
-      for (p = GC_threads[i]; 0 != p; p = p -> next) {
-	for (j = 1; j < NFREELISTS; ++j) {
-	  q = p -> ptrfree_freelists[j];
-	  if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
-	  q = p -> normal_freelists[j];
-	  if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
-#	  ifdef GC_GCJ_SUPPORT
-	    q = p -> gcj_freelists[j];
-	    if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
-#	  endif /* GC_GCJ_SUPPORT */
-	}
-      }
-    }
-}
-#endif /* THREAD_LOCAL_ALLOC */
-
-static struct GC_Thread_Rep first_thread;
-
-/* Add a thread to GC_threads.  We assume it wasn't already there.	*/
-/* Caller holds allocation lock.					*/
-GC_thread GC_new_thread(pthread_t id)
-{
-    int hv = ((word)id) % THREAD_TABLE_SZ;
-    GC_thread result;
-    static GC_bool first_thread_used = FALSE;
-    
-    if (!first_thread_used) {
-    	result = &first_thread;
-    	first_thread_used = TRUE;
-    } else {
-        result = (struct GC_Thread_Rep *)
-        	 GC_INTERNAL_MALLOC(sizeof(struct GC_Thread_Rep), NORMAL);
-    }
-    if (result == 0) return(0);
-    result -> id = id;
-    result -> next = GC_threads[hv];
-    GC_threads[hv] = result;
-    GC_ASSERT(result -> flags == 0 && result -> thread_blocked == 0);
-    return(result);
-}
-
-/* Delete a thread from GC_threads.  We assume it is there.	*/
-/* (The code intentionally traps if it wasn't.)			*/
-/* Caller holds allocation lock.				*/
-void GC_delete_thread(pthread_t id)
-{
-    int hv = ((word)id) % THREAD_TABLE_SZ;
-    register GC_thread p = GC_threads[hv];
-    register GC_thread prev = 0;
-    
-    while (!pthread_equal(p -> id, id)) {
-        prev = p;
-        p = p -> next;
-    }
-    if (prev == 0) {
-        GC_threads[hv] = p -> next;
-    } else {
-        prev -> next = p -> next;
-    }
-
-    if (p != &first_thread)
-      GC_INTERNAL_FREE(p);
-}
-
-/* If a thread has been joined, but we have not yet		*/
-/* been notified, then there may be more than one thread 	*/
-/* in the table with the same pthread id.			*/
-/* This is OK, but we need a way to delete a specific one.	*/
-void GC_delete_gc_thread(pthread_t id, GC_thread gc_id)
-{
-    int hv = ((word)id) % THREAD_TABLE_SZ;
-    register GC_thread p = GC_threads[hv];
-    register GC_thread prev = 0;
-
-    while (p != gc_id) {
-        prev = p;
-        p = p -> next;
-    }
-    if (prev == 0) {
-        GC_threads[hv] = p -> next;
-    } else {
-        prev -> next = p -> next;
-    }
-    GC_INTERNAL_FREE(p);
-}
-
-/* Return a GC_thread corresponding to a given pthread_t.	*/
-/* Returns 0 if it's not there.					*/
-/* Caller holds  allocation lock or otherwise inhibits 		*/
-/* updates.							*/
-/* If there is more than one thread with the given id we 	*/
-/* return the most recent one.					*/
-GC_thread GC_lookup_thread(pthread_t id)
-{
-    int hv = ((word)id) % THREAD_TABLE_SZ;
-    register GC_thread p = GC_threads[hv];
-    
-    while (p != 0 && !pthread_equal(p -> id, id)) p = p -> next;
-    return(p);
-}
-
-#ifdef HANDLE_FORK
-/* Remove all entries from the GC_threads table, except the	*/
-/* one for the current thread.  We need to do this in the child	*/
-/* process after a fork(), since only the current thread 	*/
-/* survives in the child.					*/
-void GC_remove_all_threads_but_me(void)
-{
-    pthread_t self = pthread_self();
-    int hv;
-    GC_thread p, next, me;
-
-    for (hv = 0; hv < THREAD_TABLE_SZ; ++hv) {
-      me = 0;
-      for (p = GC_threads[hv]; 0 != p; p = next) {
-	next = p -> next;
-	if (p -> id == self) {
-	  me = p;
-	  p -> next = 0;
-	} else {
-#	  ifdef THREAD_LOCAL_ALLOC
-	    if (!(p -> flags & FINISHED)) {
-	      GC_destroy_thread_local(p);
-	    }
-#	  endif /* THREAD_LOCAL_ALLOC */
-	  if (p != &first_thread) GC_INTERNAL_FREE(p);
-	}
-      }
-      GC_threads[hv] = me;
-    }
-}
-#endif /* HANDLE_FORK */
-
-#ifdef USE_PROC_FOR_LIBRARIES
-int GC_segment_is_thread_stack(ptr_t lo, ptr_t hi)
-{
-    int i;
-    GC_thread p;
-    
-#   ifdef PARALLEL_MARK
-      for (i = 0; i < GC_markers; ++i) {
-	if (marker_sp[i] > lo & marker_sp[i] < hi) return 1;
-      }
-#   endif
-    for (i = 0; i < THREAD_TABLE_SZ; i++) {
-      for (p = GC_threads[i]; p != 0; p = p -> next) {
-	if (0 != p -> stack_end) {
-#	  ifdef STACK_GROWS_UP
-            if (p -> stack_end >= lo && p -> stack_end < hi) return 1;
-#	  else /* STACK_GROWS_DOWN */
-            if (p -> stack_end > lo && p -> stack_end <= hi) return 1;
-#	  endif
-	}
-      }
-    }
-    return 0;
-}
-#endif /* USE_PROC_FOR_LIBRARIES */
-
-#ifdef GC_LINUX_THREADS
-/* Return the number of processors, or i<= 0 if it can't be determined.	*/
-int GC_get_nprocs()
-{
-    /* Should be "return sysconf(_SC_NPROCESSORS_ONLN);" but that	*/
-    /* appears to be buggy in many cases.				*/
-    /* We look for lines "cpu<n>" in /proc/stat.			*/
-#   define STAT_BUF_SIZE 4096
-#   define STAT_READ read
-	/* If read is wrapped, this may need to be redefined to call 	*/
-	/* the real one.						*/
-    char stat_buf[STAT_BUF_SIZE];
-    int f;
-    word result = 1;
-	/* Some old kernels only have a single "cpu nnnn ..."	*/
-	/* entry in /proc/stat.  We identify those as 		*/
-	/* uniprocessors.					*/
-    size_t i, len = 0;
-
-    f = open("/proc/stat", O_RDONLY);
-    if (f < 0 || (len = STAT_READ(f, stat_buf, STAT_BUF_SIZE)) < 100) {
-	WARN("Couldn't read /proc/stat\n", 0);
-	return -1;
-    }
-    for (i = 0; i < len - 100; ++i) {
-        if (stat_buf[i] == '\n' && stat_buf[i+1] == 'c'
-	    && stat_buf[i+2] == 'p' && stat_buf[i+3] == 'u') {
-	    int cpu_no = atoi(stat_buf + i + 4);
-	    if (cpu_no >= result) result = cpu_no + 1;
-	}
-    }
-    close(f);
-    return result;
-}
-#endif /* GC_LINUX_THREADS */
-
-/* We hold the GC lock.  Wait until an in-progress GC has finished.	*/
-/* Repeatedly RELEASES GC LOCK in order to wait.			*/
-/* If wait_for_all is true, then we exit with the GC lock held and no	*/
-/* collection in progress; otherwise we just wait for the current GC	*/
-/* to finish.								*/
-extern GC_bool GC_collection_in_progress();
-void GC_wait_for_gc_completion(GC_bool wait_for_all)
-{
-    if (GC_incremental && GC_collection_in_progress()) {
-	int old_gc_no = GC_gc_no;
-
-	/* Make sure that no part of our stack is still on the mark stack, */
-	/* since it's about to be unmapped.				   */
-	while (GC_incremental && GC_collection_in_progress()
-	       && (wait_for_all || old_gc_no == GC_gc_no)) {
-	    ENTER_GC();
-	    GC_in_thread_creation = TRUE;
-            GC_collect_a_little_inner(1);
-	    GC_in_thread_creation = FALSE;
-	    EXIT_GC();
-	    UNLOCK();
-	    sched_yield();
-	    LOCK();
-	}
-    }
-}
-
-#ifdef HANDLE_FORK
-/* Procedures called before and after a fork.  The goal here is to make */
-/* it safe to call GC_malloc() in a forked child.  It's unclear that is	*/
-/* attainable, since the single UNIX spec seems to imply that one 	*/
-/* should only call async-signal-safe functions, and we probably can't	*/
-/* quite guarantee that.  But we give it our best shot.  (That same	*/
-/* spec also implies that it's not safe to call the system malloc	*/
-/* between fork() and exec().  Thus we're doing no worse than it.	*/
-
-/* Called before a fork()		*/
-void GC_fork_prepare_proc(void)
-{
-    /* Acquire all relevant locks, so that after releasing the locks	*/
-    /* the child will see a consistent state in which monitor 		*/
-    /* invariants hold.	 Unfortunately, we can't acquire libc locks	*/
-    /* we might need, and there seems to be no guarantee that libc	*/
-    /* must install a suitable fork handler.				*/
-    /* Wait for an ongoing GC to finish, since we can't finish it in	*/
-    /* the (one remaining thread in) the child.				*/
-      LOCK();
-#     if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-        GC_wait_for_reclaim();
-#     endif
-      GC_wait_for_gc_completion(TRUE);
-#     if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-        GC_acquire_mark_lock();
-#     endif
-}
-
-/* Called in parent after a fork()	*/
-void GC_fork_parent_proc(void)
-{
-#   if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-      GC_release_mark_lock();
-#   endif
-    UNLOCK();
-}
-
-/* Called in child after a fork()	*/
-void GC_fork_child_proc(void)
-{
-    /* Clean up the thread table, so that just our thread is left. */
-#   if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-      GC_release_mark_lock();
-#   endif
-    GC_remove_all_threads_but_me();
-#   ifdef PARALLEL_MARK
-      /* Turn off parallel marking in the child, since we are probably 	*/
-      /* just going to exec, and we would have to restart mark threads.	*/
-        GC_markers = 1;
-        GC_parallel = FALSE;
-#   endif /* PARALLEL_MARK */
-    UNLOCK();
-}
-#endif /* HANDLE_FORK */
-
-#if defined(GC_DGUX386_THREADS)
-/* Return the number of processors, or i<= 0 if it can't be determined. */
-int GC_get_nprocs()
-{
-    /* <takis@XFree86.Org> */
-    int numCpus;
-    struct dg_sys_info_pm_info pm_sysinfo;
-    int status =0;
-
-    status = dg_sys_info((long int *) &pm_sysinfo,
-	DG_SYS_INFO_PM_INFO_TYPE, DG_SYS_INFO_PM_CURRENT_VERSION);
-    if (status < 0)
-       /* set -1 for error */
-       numCpus = -1;
-    else
-      /* Active CPUs */
-      numCpus = pm_sysinfo.idle_vp_count;
-
-#  ifdef DEBUG_THREADS
-    GC_printf1("Number of active CPUs in this system: %d\n", numCpus);
-#  endif
-    return(numCpus);
-}
-#endif /* GC_DGUX386_THREADS */
-
-/* We hold the allocation lock.	*/
-void GC_thr_init()
-{
-#   ifndef GC_DARWIN_THREADS
-      int dummy;
-#   endif
-    GC_thread t;
-
-    if (GC_thr_initialized) return;
-    GC_thr_initialized = TRUE;
-    
-#   ifdef HANDLE_FORK
-      /* Prepare for a possible fork.	*/
-        pthread_atfork(GC_fork_prepare_proc, GC_fork_parent_proc,
-	  	       GC_fork_child_proc);
-#   endif /* HANDLE_FORK */
-    /* Add the initial thread, so we can stop it.	*/
-      t = GC_new_thread(pthread_self());
-#     ifdef GC_DARWIN_THREADS
-         t -> stop_info.mach_thread = mach_thread_self();
-#     else
-         t -> stop_info.stack_ptr = (ptr_t)(&dummy);
-#     endif
-      t -> flags = DETACHED | MAIN_THREAD;
-
-    GC_stop_init();
-
-    /* Set GC_nprocs.  */
-      {
-	char * nprocs_string = GETENV("GC_NPROCS");
-	GC_nprocs = -1;
-	if (nprocs_string != NULL) GC_nprocs = atoi(nprocs_string);
-      }
-      if (GC_nprocs <= 0) {
-#       if defined(GC_HPUX_THREADS)
-	  GC_nprocs = pthread_num_processors_np();
-#       endif
-#	if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
-	   || defined(GC_SOLARIS_PTHREADS) || defined(GC_GNU_THREADS)
-	  GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
-	  if (GC_nprocs <= 0) GC_nprocs = 1;
-#	endif
-#       if defined(GC_IRIX_THREADS)
-	  GC_nprocs = sysconf(_SC_NPROC_ONLN);
-	  if (GC_nprocs <= 0) GC_nprocs = 1;
-#       endif
-#       if defined(GC_DARWIN_THREADS) || defined(GC_FREEBSD_THREADS)
-	  int ncpus = 1;
-	  size_t len = sizeof(ncpus);
-	  sysctl((int[2]) {CTL_HW, HW_NCPU}, 2, &ncpus, &len, NULL, 0);
-	  GC_nprocs = ncpus;
-#       endif
-#	if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS)
-          GC_nprocs = GC_get_nprocs();
-#	endif
-      }
-      if (GC_nprocs <= 0) {
-	WARN("GC_get_nprocs() returned %ld\n", GC_nprocs);
-	GC_nprocs = 2;
-#	ifdef PARALLEL_MARK
-	  GC_markers = 1;
-#	endif
-      } else {
-#	ifdef PARALLEL_MARK
-          {
-	    char * markers_string = GETENV("GC_MARKERS");
-	    if (markers_string != NULL) {
-	      GC_markers = atoi(markers_string);
-	    } else {
-	      GC_markers = GC_nprocs;
-	    }
-          }
-#	endif
-      }
-#   ifdef PARALLEL_MARK
-#     ifdef CONDPRINT
-        if (GC_print_stats) {
-          GC_printf2("Number of processors = %ld, "
-		 "number of marker threads = %ld\n", GC_nprocs, GC_markers);
-	}
-#     endif
-      if (GC_markers == 1) {
-	GC_parallel = FALSE;
-#	ifdef CONDPRINT
-	  if (GC_print_stats) {
-	    GC_printf0("Single marker thread, turning off parallel marking\n");
-	  }
-#	endif
-      } else {
-	GC_parallel = TRUE;
-	/* Disable true incremental collection, but generational is OK.	*/
-	GC_time_limit = GC_TIME_UNLIMITED;
-      }
-      /* If we are using a parallel marker, actually start helper threads.  */
-        if (GC_parallel) start_mark_threads();
-#   endif
-}
-
-
-/* Perform all initializations, including those that	*/
-/* may require allocation.				*/
-/* Called without allocation lock.			*/
-/* Must be called before a second thread is created.	*/
-/* Called without allocation lock.			*/
-void GC_init_parallel()
-{
-    if (parallel_initialized) return;
-    parallel_initialized = TRUE;
-
-    /* GC_init() calls us back, so set flag first.	*/
-    if (!GC_is_initialized) GC_init();
-    /* Initialize thread local free lists if used.	*/
-#   if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
-      LOCK();
-      GC_init_thread_local(GC_lookup_thread(pthread_self()));
-      UNLOCK();
-#   endif
-}
-
-
-#if !defined(GC_DARWIN_THREADS)
-int WRAP_FUNC(pthread_sigmask)(int how, const sigset_t *set, sigset_t *oset)
-{
-    sigset_t fudged_set;
-    
-    if (set != NULL && (how == SIG_BLOCK || how == SIG_SETMASK)) {
-        fudged_set = *set;
-        sigdelset(&fudged_set, SIG_SUSPEND);
-        set = &fudged_set;
-    }
-    return(REAL_FUNC(pthread_sigmask)(how, set, oset));
-}
-#endif /* !GC_DARWIN_THREADS */
-
-/* Wrappers for functions that are likely to block for an appreciable	*/
-/* length of time.  Must be called in pairs, if at all.			*/
-/* Nothing much beyond the system call itself should be executed	*/
-/* between these.							*/
-
-void GC_start_blocking(void) {
-#   define SP_SLOP 128
-    GC_thread me;
-    LOCK();
-    me = GC_lookup_thread(pthread_self());
-    GC_ASSERT(!(me -> thread_blocked));
-#   ifdef SPARC
-	me -> stop_info.stack_ptr = (ptr_t)GC_save_regs_in_stack();
-#   else
-#   ifndef GC_DARWIN_THREADS
-	me -> stop_info.stack_ptr = (ptr_t)GC_approx_sp();
-#   endif
-#   endif
-#   ifdef IA64
-	me -> backing_store_ptr = (ptr_t)GC_save_regs_in_stack() + SP_SLOP;
-#   endif
-    /* Add some slop to the stack pointer, since the wrapped call may 	*/
-    /* end up pushing more callee-save registers.			*/
-#   ifndef GC_DARWIN_THREADS
-#   ifdef STACK_GROWS_UP
-	me -> stop_info.stack_ptr += SP_SLOP;
-#   else
-	me -> stop_info.stack_ptr -= SP_SLOP;
-#   endif
-#   endif
-    me -> thread_blocked = TRUE;
-    UNLOCK();
-}
-
-void GC_end_blocking(void) {
-    GC_thread me;
-    LOCK();   /* This will block if the world is stopped.	*/
-    me = GC_lookup_thread(pthread_self());
-    GC_ASSERT(me -> thread_blocked);
-    me -> thread_blocked = FALSE;
-    UNLOCK();
-}
-    
-#if defined(GC_DGUX386_THREADS)
-#define __d10_sleep sleep
-#endif /* GC_DGUX386_THREADS */
-
-/* A wrapper for the standard C sleep function	*/
-int WRAP_FUNC(sleep) (unsigned int seconds)
-{
-    int result;
-
-    GC_start_blocking();
-    result = REAL_FUNC(sleep)(seconds);
-    GC_end_blocking();
-    return result;
-}
-
-struct start_info {
-    void *(*start_routine)(void *);
-    void *arg;
-    word flags;
-    sem_t registered;   	/* 1 ==> in our thread table, but 	*/
-				/* parent hasn't yet noticed.		*/
-};
-
-/* Called at thread exit.				*/
-/* Never called for main thread.  That's OK, since it	*/
-/* results in at most a tiny one-time leak.  And 	*/
-/* linuxthreads doesn't reclaim the main threads 	*/
-/* resources or id anyway.				*/
-void GC_thread_exit_proc(void *arg)
-{
-    GC_thread me;
-
-    LOCK();
-    me = GC_lookup_thread(pthread_self());
-    GC_destroy_thread_local(me);
-    if (me -> flags & DETACHED) {
-    	GC_delete_thread(pthread_self());
-    } else {
-	me -> flags |= FINISHED;
-    }
-#   if defined(THREAD_LOCAL_ALLOC) && !defined(USE_PTHREAD_SPECIFIC) \
-       && !defined(USE_COMPILER_TLS) && !defined(DBG_HDRS_ALL)
-      GC_remove_specific(GC_thread_key);
-#   endif
-    /* The following may run the GC from "nonexistent" thread.	*/
-    GC_wait_for_gc_completion(FALSE);
-    UNLOCK();
-}
-
-int WRAP_FUNC(pthread_join)(pthread_t thread, void **retval)
-{
-    int result;
-    GC_thread thread_gc_id;
-    
-    LOCK();
-    thread_gc_id = GC_lookup_thread(thread);
-    /* This is guaranteed to be the intended one, since the thread id	*/
-    /* cant have been recycled by pthreads.				*/
-    UNLOCK();
-    result = REAL_FUNC(pthread_join)(thread, retval);
-# if defined (GC_FREEBSD_THREADS)
-    /* On FreeBSD, the wrapped pthread_join() sometimes returns (what
-       appears to be) a spurious EINTR which caused the test and real code
-       to gratuitously fail.  Having looked at system pthread library source
-       code, I see how this return code may be generated.  In one path of
-       code, pthread_join() just returns the errno setting of the thread
-       being joined.  This does not match the POSIX specification or the
-       local man pages thus I have taken the liberty to catch this one
-       spurious return value properly conditionalized on GC_FREEBSD_THREADS. */
-    if (result == EINTR) result = 0;
-# endif
-    if (result == 0) {
-        LOCK();
-        /* Here the pthread thread id may have been recycled. */
-        GC_delete_gc_thread(thread, thread_gc_id);
-        UNLOCK();
-    }
-    return result;
-}
-
-int
-WRAP_FUNC(pthread_detach)(pthread_t thread)
-{
-    int result;
-    GC_thread thread_gc_id;
-    
-    LOCK();
-    thread_gc_id = GC_lookup_thread(thread);
-    UNLOCK();
-    result = REAL_FUNC(pthread_detach)(thread);
-    if (result == 0) {
-      LOCK();
-      thread_gc_id -> flags |= DETACHED;
-      /* Here the pthread thread id may have been recycled. */
-      if (thread_gc_id -> flags & FINISHED) {
-        GC_delete_gc_thread(thread, thread_gc_id);
-      }
-      UNLOCK();
-    }
-    return result;
-}
-
-GC_bool GC_in_thread_creation = FALSE;
-
-GC_PTR GC_get_thread_stack_base()
-{  
-# ifdef HAVE_PTHREAD_GETATTR_NP
-  pthread_t my_pthread;
-  pthread_attr_t attr;
-  ptr_t stack_addr;
-  size_t stack_size;
-  
-  my_pthread = pthread_self();  
-  if (pthread_getattr_np (my_pthread, &attr) != 0)
-    {
-#   ifdef DEBUG_THREADS
-      GC_printf0("Can not determine stack base for attached thread");
-#   endif
-      return 0;
-    }
-  pthread_attr_getstack (&attr, (void **) &stack_addr, &stack_size);
-  pthread_attr_destroy (&attr);
-  
-#   ifdef DEBUG_THREADS
-	GC_printf1("attached thread stack address: 0x%x\n", stack_addr);
-#   endif
-
-#   ifdef STACK_GROWS_DOWN
-      return stack_addr + stack_size;
-#   else
-      return stack_addr;
-#   endif
-
-# else
-#   ifdef DEBUG_THREADS
-	GC_printf0("Can not determine stack base for attached thread");
-#   endif
-  return 0;
-# endif
-}
-
-void GC_register_my_thread()
-{
-  GC_thread me;
-  pthread_t my_pthread;
-
-  my_pthread = pthread_self();
-#   ifdef DEBUG_THREADS
-      GC_printf1("Attaching thread 0x%lx\n", my_pthread);
-      GC_printf1("pid = %ld\n", (long) getpid());
-#   endif
-  
-  /* Check to ensure this thread isn't attached already. */
-  LOCK();
-  me = GC_lookup_thread (my_pthread);
-  UNLOCK();
-  if (me != 0)
-    {
-#   ifdef DEBUG_THREADS
-      GC_printf1("Attempt to re-attach known thread 0x%lx\n", my_pthread);
-#   endif
-      return;
-    }
-
-  LOCK();
-  GC_in_thread_creation = TRUE;
-  me = GC_new_thread(my_pthread);
-  GC_in_thread_creation = FALSE;
-
-  me -> flags |= DETACHED;  
-
-#ifdef GC_DARWIN_THREADS
-    me -> stop_info.mach_thread = mach_thread_self();
-#else
-    me -> stack_end = GC_get_thread_stack_base();    
-    if (me -> stack_end == 0)
-      GC_abort("Can not determine stack base for attached thread");
-    
-#   ifdef STACK_GROWS_DOWN
-      me -> stop_info.stack_ptr = me -> stack_end - 0x10;
-#   else
-      me -> stop_info.stack_ptr = me -> stack_end + 0x10;
-#   endif
-#endif
-
-#   ifdef IA64
-      me -> backing_store_end = (ptr_t)
-			(GC_save_regs_in_stack() & ~(GC_page_size - 1));
-      /* This is also < 100% convincing.  We should also read this 	*/
-      /* from /proc, but the hook to do so isn't there yet.		*/
-#   endif /* IA64 */
-
-#   if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
-        GC_init_thread_local(me);
-#   endif
-  UNLOCK();
-}
-
-void GC_unregister_my_thread()
-{
-  pthread_t my_pthread;
-
-  my_pthread = pthread_self();
-
-#   ifdef DEBUG_THREADS
-      GC_printf1("Detaching thread 0x%lx\n", my_pthread);
-#   endif
-
-  GC_thread_exit_proc (0);
-}
-
-void * GC_start_routine(void * arg)
-{
-    int dummy;
-    struct start_info * si = arg;
-    void * result;
-    GC_thread me;
-    pthread_t my_pthread;
-    void *(*start)(void *);
-    void *start_arg;
-
-    my_pthread = pthread_self();
-#   ifdef DEBUG_THREADS
-        GC_printf1("Starting thread 0x%lx\n", my_pthread);
-        GC_printf1("pid = %ld\n", (long) getpid());
-        GC_printf1("sp = 0x%lx\n", (long) &arg);
-#   endif
-    LOCK();
-    GC_in_thread_creation = TRUE;
-    me = GC_new_thread(my_pthread);
-    GC_in_thread_creation = FALSE;
-#ifdef GC_DARWIN_THREADS
-    me -> stop_info.mach_thread = mach_thread_self();
-#else
-    me -> stop_info.stack_ptr = 0;
-#endif
-    me -> flags = si -> flags;
-    /* me -> stack_end = GC_linux_stack_base(); -- currently (11/99)	*/
-    /* doesn't work because the stack base in /proc/self/stat is the 	*/
-    /* one for the main thread.  There is a strong argument that that's	*/
-    /* a kernel bug, but a pervasive one.				*/
-#   ifdef STACK_GROWS_DOWN
-      me -> stack_end = (ptr_t)(((word)(&dummy) + (GC_page_size - 1))
-		                & ~(GC_page_size - 1));
-#	  ifndef GC_DARWIN_THREADS
-        me -> stop_info.stack_ptr = me -> stack_end - 0x10;
-#	  endif
-	/* Needs to be plausible, since an asynchronous stack mark	*/
-	/* should not crash.						*/
-#   else
-      me -> stack_end = (ptr_t)((word)(&dummy) & ~(GC_page_size - 1));
-      me -> stop_info.stack_ptr = me -> stack_end + 0x10;
-#   endif
-    /* This is dubious, since we may be more than a page into the stack, */
-    /* and hence skip some of it, though it's not clear that matters.	 */
-#   ifdef IA64
-      me -> backing_store_end = (ptr_t)
-			(GC_save_regs_in_stack() & ~(GC_page_size - 1));
-      /* This is also < 100% convincing.  We should also read this 	*/
-      /* from /proc, but the hook to do so isn't there yet.		*/
-#   endif /* IA64 */
-    UNLOCK();
-    start = si -> start_routine;
-#   ifdef DEBUG_THREADS
-	GC_printf1("start_routine = 0x%lx\n", start);
-#   endif
-    start_arg = si -> arg;
-    sem_post(&(si -> registered));	/* Last action on si.	*/
-    					/* OK to deallocate.	*/
-    pthread_cleanup_push(GC_thread_exit_proc, 0);
-#   if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
- 	LOCK();
-        GC_init_thread_local(me);
-	UNLOCK();
-#   endif
-    result = (*start)(start_arg);
-#if DEBUG_THREADS
-        GC_printf1("Finishing thread 0x%x\n", pthread_self());
-#endif
-    me -> status = result;
-    pthread_cleanup_pop(1);
-    /* Cleanup acquires lock, ensuring that we can't exit		*/
-    /* while a collection that thinks we're alive is trying to stop     */
-    /* us.								*/
-    return(result);
-}
-
-int
-WRAP_FUNC(pthread_create)(pthread_t *new_thread,
-		  const pthread_attr_t *attr,
-                  void *(*start_routine)(void *), void *arg)
-{
-    int result;
-    int detachstate;
-    word my_flags = 0;
-    struct start_info * si; 
-	/* This is otherwise saved only in an area mmapped by the thread */
-	/* library, which isn't visible to the collector.		 */
- 
-    /* We resist the temptation to muck with the stack size here,	*/
-    /* even if the default is unreasonably small.  That's the client's	*/
-    /* responsibility.							*/
-
-    LOCK();
-    si = (struct start_info *)GC_INTERNAL_MALLOC(sizeof(struct start_info),
-						 NORMAL);
-    UNLOCK();
-    if (!parallel_initialized) GC_init_parallel();
-    if (0 == si) return(ENOMEM);
-    sem_init(&(si -> registered), 0, 0);
-    si -> start_routine = start_routine;
-    si -> arg = arg;
-    LOCK();
-    if (!GC_thr_initialized) GC_thr_init();
-#   ifdef GC_ASSERTIONS
-      {
-	size_t stack_size;
-	if (NULL == attr) {
-	   pthread_attr_t my_attr;
-	   pthread_attr_init(&my_attr);
-	   pthread_attr_getstacksize(&my_attr, &stack_size);
-	} else {
-	   pthread_attr_getstacksize(attr, &stack_size);
-	}
-#       ifdef PARALLEL_MARK
-	  GC_ASSERT(stack_size >= (8*HBLKSIZE*sizeof(word)));
-#       else
-          /* FreeBSD-5.3/Alpha: default pthread stack is 64K, 	*/
-	  /* HBLKSIZE=8192, sizeof(word)=8			*/
-	  GC_ASSERT(stack_size >= 65536);
-#       endif
-	/* Our threads may need to do some work for the GC.	*/
-	/* Ridiculously small threads won't work, and they	*/
-	/* probably wouldn't work anyway.			*/
-      }
-#   endif
-    if (NULL == attr) {
-	detachstate = PTHREAD_CREATE_JOINABLE;
-    } else { 
-        pthread_attr_getdetachstate(attr, &detachstate);
-    }
-    if (PTHREAD_CREATE_DETACHED == detachstate) my_flags |= DETACHED;
-    si -> flags = my_flags;
-    UNLOCK();
-#   ifdef DEBUG_THREADS
-        GC_printf1("About to start new thread from thread 0x%X\n",
-		   pthread_self());
-#   endif
-
-    result = REAL_FUNC(pthread_create)(new_thread, attr, GC_start_routine, si);
-
-#   ifdef DEBUG_THREADS
-        GC_printf1("Started thread 0x%X\n", *new_thread);
-#   endif
-    /* Wait until child has been added to the thread table.		*/
-    /* This also ensures that we hold onto si until the child is done	*/
-    /* with it.  Thus it doesn't matter whether it is otherwise		*/
-    /* visible to the collector.					*/
-    if (0 == result) {
-	while (0 != sem_wait(&(si -> registered))) {
-            if (EINTR != errno) ABORT("sem_wait failed");
-	}
-    }
-    sem_destroy(&(si -> registered));
-    LOCK();
-    GC_INTERNAL_FREE(si);
-    UNLOCK();
-
-    return(result);
-}
-
-#ifdef GENERIC_COMPARE_AND_SWAP
-  pthread_mutex_t GC_compare_and_swap_lock = PTHREAD_MUTEX_INITIALIZER;
-
-  GC_bool GC_compare_and_exchange(volatile GC_word *addr,
-  			          GC_word old, GC_word new_val)
-  {
-    GC_bool result;
-    pthread_mutex_lock(&GC_compare_and_swap_lock);
-    if (*addr == old) {
-      *addr = new_val;
-      result = TRUE;
-    } else {
-      result = FALSE;
-    }
-    pthread_mutex_unlock(&GC_compare_and_swap_lock);
-    return result;
-  }
-  
-  GC_word GC_atomic_add(volatile GC_word *addr, GC_word how_much)
-  {
-    GC_word old;
-    pthread_mutex_lock(&GC_compare_and_swap_lock);
-    old = *addr;
-    *addr = old + how_much;
-    pthread_mutex_unlock(&GC_compare_and_swap_lock);
-    return old;
-  }
-
-#endif /* GENERIC_COMPARE_AND_SWAP */
-/* Spend a few cycles in a way that can't introduce contention with	*/
-/* othre threads.							*/
-void GC_pause()
-{
-    int i;
-#   if !defined(__GNUC__) || defined(__INTEL_COMPILER)
-      volatile word dummy = 0;
-#   endif
-
-    for (i = 0; i < 10; ++i) { 
-#     if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-        __asm__ __volatile__ (" " : : : "memory");
-#     else
-	/* Something that's unlikely to be optimized away. */
-	GC_noop(++dummy);
-#     endif
-    }
-}
-    
-#define SPIN_MAX 128	/* Maximum number of calls to GC_pause before	*/
-			/* give up.					*/
-
-VOLATILE GC_bool GC_collecting = 0;
-			/* A hint that we're in the collector and       */
-                        /* holding the allocation lock for an           */
-                        /* extended period.                             */
-
-#if !defined(USE_SPIN_LOCK) || defined(PARALLEL_MARK)
-/* If we don't want to use the below spinlock implementation, either	*/
-/* because we don't have a GC_test_and_set implementation, or because 	*/
-/* we don't want to risk sleeping, we can still try spinning on 	*/
-/* pthread_mutex_trylock for a while.  This appears to be very		*/
-/* beneficial in many cases.						*/
-/* I suspect that under high contention this is nearly always better	*/
-/* than the spin lock.  But it's a bit slower on a uniprocessor.	*/
-/* Hence we still default to the spin lock.				*/
-/* This is also used to acquire the mark lock for the parallel		*/
-/* marker.								*/
-
-/* Here we use a strict exponential backoff scheme.  I don't know 	*/
-/* whether that's better or worse than the above.  We eventually 	*/
-/* yield by calling pthread_mutex_lock(); it never makes sense to	*/
-/* explicitly sleep.							*/
-
-#define LOCK_STATS
-#ifdef LOCK_STATS
-  unsigned long GC_spin_count = 0;
-  unsigned long GC_block_count = 0;
-  unsigned long GC_unlocked_count = 0;
-#endif
-
-void GC_generic_lock(pthread_mutex_t * lock)
-{
-#ifndef NO_PTHREAD_TRYLOCK
-    unsigned pause_length = 1;
-    unsigned i;
-    
-    if (0 == pthread_mutex_trylock(lock)) {
-#       ifdef LOCK_STATS
-	    ++GC_unlocked_count;
-#       endif
-	return;
-    }
-    for (; pause_length <= SPIN_MAX; pause_length <<= 1) {
-	for (i = 0; i < pause_length; ++i) {
-	    GC_pause();
-	}
-        switch(pthread_mutex_trylock(lock)) {
-	    case 0:
-#		ifdef LOCK_STATS
-		    ++GC_spin_count;
-#		endif
-		return;
-	    case EBUSY:
-		break;
-	    default:
-		ABORT("Unexpected error from pthread_mutex_trylock");
-        }
-    }
-#endif /* !NO_PTHREAD_TRYLOCK */
-#   ifdef LOCK_STATS
-	++GC_block_count;
-#   endif
-    pthread_mutex_lock(lock);
-}
-
-#endif /* !USE_SPIN_LOCK || PARALLEL_MARK */
-
-#if defined(USE_SPIN_LOCK)
-
-/* Reasonably fast spin locks.  Basically the same implementation */
-/* as STL alloc.h.  This isn't really the right way to do this.   */
-/* but until the POSIX scheduling mess gets straightened out ...  */
-
-volatile unsigned int GC_allocate_lock = 0;
-
-
-void GC_lock()
-{
-#   define low_spin_max 30  /* spin cycles if we suspect uniprocessor */
-#   define high_spin_max SPIN_MAX /* spin cycles for multiprocessor */
-    static unsigned spin_max = low_spin_max;
-    unsigned my_spin_max;
-    static unsigned last_spins = 0;
-    unsigned my_last_spins;
-    int i;
-
-    if (!GC_test_and_set(&GC_allocate_lock)) {
-        return;
-    }
-    my_spin_max = spin_max;
-    my_last_spins = last_spins;
-    for (i = 0; i < my_spin_max; i++) {
-        if (GC_collecting || GC_nprocs == 1) goto yield;
-        if (i < my_last_spins/2 || GC_allocate_lock) {
-            GC_pause();
-            continue;
-        }
-        if (!GC_test_and_set(&GC_allocate_lock)) {
-	    /*
-             * got it!
-             * Spinning worked.  Thus we're probably not being scheduled
-             * against the other process with which we were contending.
-             * Thus it makes sense to spin longer the next time.
-	     */
-            last_spins = i;
-            spin_max = high_spin_max;
-            return;
-        }
-    }
-    /* We are probably being scheduled against the other process.  Sleep. */
-    spin_max = low_spin_max;
-yield:
-    for (i = 0;; ++i) {
-        if (!GC_test_and_set(&GC_allocate_lock)) {
-            return;
-        }
-#       define SLEEP_THRESHOLD 12
-		/* Under Linux very short sleeps tend to wait until	*/
-		/* the current time quantum expires.  On old Linux	*/
-		/* kernels nanosleep(<= 2ms) just spins under Linux.    */
-		/* (Under 2.4, this happens only for real-time		*/
-		/* processes.)  We want to minimize both behaviors	*/
-		/* here.						*/
-        if (i < SLEEP_THRESHOLD) {
-            sched_yield();
-	} else {
-	    struct timespec ts;
-	
-	    if (i > 24) i = 24;
-			/* Don't wait for more than about 15msecs, even	*/
-			/* under extreme contention.			*/
-	    ts.tv_sec = 0;
-	    ts.tv_nsec = 1 << i;
-	    nanosleep(&ts, 0);
-	}
-    }
-}
-
-#else  /* !USE_SPINLOCK */
-void GC_lock()
-{
-#ifndef NO_PTHREAD_TRYLOCK
-    if (1 == GC_nprocs || GC_collecting) {
-	pthread_mutex_lock(&GC_allocate_ml);
-    } else {
-        GC_generic_lock(&GC_allocate_ml);
-    }
-#else  /* !NO_PTHREAD_TRYLOCK */
-    pthread_mutex_lock(&GC_allocate_ml);
-#endif /* !NO_PTHREAD_TRYLOCK */
-}
-
-#endif /* !USE_SPINLOCK */
-
-#if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-
-#ifdef GC_ASSERTIONS
-  pthread_t GC_mark_lock_holder = NO_THREAD;
-#endif
-
-#if 0
-  /* Ugly workaround for a linux threads bug in the final versions      */
-  /* of glibc2.1.  Pthread_mutex_trylock sets the mutex owner           */
-  /* field even when it fails to acquire the mutex.  This causes        */
-  /* pthread_cond_wait to die.  Remove for glibc2.2.                    */
-  /* According to the man page, we should use                           */
-  /* PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, but that isn't actually   */
-  /* defined.                                                           */
-  static pthread_mutex_t mark_mutex =
-        {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, {0, 0}};
-#else
-  static pthread_mutex_t mark_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-static pthread_cond_t builder_cv = PTHREAD_COND_INITIALIZER;
-
-void GC_acquire_mark_lock()
-{
-/*
-    if (pthread_mutex_lock(&mark_mutex) != 0) {
-	ABORT("pthread_mutex_lock failed");
-    }
-*/
-    GC_generic_lock(&mark_mutex);
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = pthread_self();
-#   endif
-}
-
-void GC_release_mark_lock()
-{
-    GC_ASSERT(GC_mark_lock_holder == pthread_self());
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = NO_THREAD;
-#   endif
-    if (pthread_mutex_unlock(&mark_mutex) != 0) {
-	ABORT("pthread_mutex_unlock failed");
-    }
-}
-
-/* Collector must wait for a freelist builders for 2 reasons:		*/
-/* 1) Mark bits may still be getting examined without lock.		*/
-/* 2) Partial free lists referenced only by locals may not be scanned 	*/
-/*    correctly, e.g. if they contain "pointer-free" objects, since the	*/
-/*    free-list link may be ignored.					*/
-void GC_wait_builder()
-{
-    GC_ASSERT(GC_mark_lock_holder == pthread_self());
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = NO_THREAD;
-#   endif
-    if (pthread_cond_wait(&builder_cv, &mark_mutex) != 0) {
-	ABORT("pthread_cond_wait failed");
-    }
-    GC_ASSERT(GC_mark_lock_holder == NO_THREAD);
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = pthread_self();
-#   endif
-}
-
-void GC_wait_for_reclaim()
-{
-    GC_acquire_mark_lock();
-    while (GC_fl_builder_count > 0) {
-	GC_wait_builder();
-    }
-    GC_release_mark_lock();
-}
-
-void GC_notify_all_builder()
-{
-    GC_ASSERT(GC_mark_lock_holder == pthread_self());
-    if (pthread_cond_broadcast(&builder_cv) != 0) {
-	ABORT("pthread_cond_broadcast failed");
-    }
-}
-
-#endif /* PARALLEL_MARK || THREAD_LOCAL_ALLOC */
-
-#ifdef PARALLEL_MARK
-
-static pthread_cond_t mark_cv = PTHREAD_COND_INITIALIZER;
-
-void GC_wait_marker()
-{
-    GC_ASSERT(GC_mark_lock_holder == pthread_self());
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = NO_THREAD;
-#   endif
-    if (pthread_cond_wait(&mark_cv, &mark_mutex) != 0) {
-	ABORT("pthread_cond_wait failed");
-    }
-    GC_ASSERT(GC_mark_lock_holder == NO_THREAD);
-#   ifdef GC_ASSERTIONS
-	GC_mark_lock_holder = pthread_self();
-#   endif
-}
-
-void GC_notify_all_marker()
-{
-    if (pthread_cond_broadcast(&mark_cv) != 0) {
-	ABORT("pthread_cond_broadcast failed");
-    }
-}
-
-#endif /* PARALLEL_MARK */
-
-# endif /* GC_LINUX_THREADS and friends */
-
diff --git a/boehm-gc/ptr_chck.c b/boehm-gc/ptr_chck.c
deleted file mode 100644
index 09c86cb599d..00000000000
--- a/boehm-gc/ptr_chck.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* 
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-/*
- * These are checking routines calls to which could be inserted by a
- * preprocessor to validate C pointer arithmetic.
- */
-
-#include "private/gc_pmark.h"
-
-#ifdef __STDC__
-void GC_default_same_obj_print_proc(GC_PTR p, GC_PTR q)
-#else
-void GC_default_same_obj_print_proc (p, q)
-GC_PTR p, q;
-#endif
-{
-    GC_err_printf2("0x%lx and 0x%lx are not in the same object\n",
-    		   (unsigned long)p, (unsigned long)q);
-    ABORT("GC_same_obj test failed");
-}
-
-void (*GC_same_obj_print_proc) GC_PROTO((GC_PTR, GC_PTR))
-		= GC_default_same_obj_print_proc;
-
-/* Check that p and q point to the same object.  Call		*/
-/* *GC_same_obj_print_proc if they don't.			*/
-/* Returns the first argument.  (Return value may be hard 	*/
-/* to use,due to typing issues.  But if we had a suitable 	*/
-/* preprocessor ...)						*/
-/* Succeeds if neither p nor q points to the heap.		*/
-/* We assume this is performance critical.  (It shouldn't	*/
-/* be called by production code, but this can easily make	*/
-/* debugging intolerably slow.)					*/
-#ifdef __STDC__
-  GC_PTR GC_same_obj(register void *p, register void *q)
-#else
-  GC_PTR GC_same_obj(p, q)
-  register char *p, *q;
-#endif
-{
-    register struct hblk *h;
-    register hdr *hhdr;
-    register ptr_t base, limit;
-    register word sz;
-    
-    if (!GC_is_initialized) GC_init();
-    hhdr = HDR((word)p);
-    if (hhdr == 0) {
-   	if (divHBLKSZ((word)p) != divHBLKSZ((word)q)
-   	    && HDR((word)q) != 0) {
-   	    goto fail;
-   	}
-   	return(p);
-    }
-    /* If it's a pointer to the middle of a large object, move it	*/
-    /* to the beginning.						*/
-    if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-    	h = HBLKPTR(p) - (word)hhdr;
-    	hhdr = HDR(h);
-	while (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-	   h = FORWARDED_ADDR(h, hhdr);
-	   hhdr = HDR(h);
-	}
-	limit = (ptr_t)((word *)h + hhdr -> hb_sz);
-	if ((ptr_t)p >= limit || (ptr_t)q >= limit || (ptr_t)q < (ptr_t)h ) {
-	    goto fail;
-	}
-	return(p);
-    }
-    sz = WORDS_TO_BYTES(hhdr -> hb_sz);
-    if (sz > MAXOBJBYTES) {
-      base = (ptr_t)HBLKPTR(p);
-      limit = base + sz;
-      if ((ptr_t)p >= limit) {
-        goto fail;
-      }
-    } else {
-      register int map_entry;
-      register int pdispl = HBLKDISPL(p);
-      
-      map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);
-      if (map_entry > CPP_MAX_OFFSET) {
-         map_entry = BYTES_TO_WORDS(pdispl) % BYTES_TO_WORDS(sz);
-	 if (HBLKPTR(p) != HBLKPTR(q)) goto fail;
-	 	/* W/o this check, we might miss an error if 	*/
-	 	/* q points to the first object on a page, and	*/
-	 	/* points just before the page.			*/
-      }
-      base = (char *)((word)p & ~(WORDS_TO_BYTES(1) - 1));
-      base -= WORDS_TO_BYTES(map_entry);
-      limit = base + sz;
-    }
-    /* [base, limit) delimits the object containing p, if any.	*/
-    /* If p is not inside a valid object, then either q is	*/
-    /* also outside any valid object, or it is outside 		*/
-    /* [base, limit).						*/
-    if ((ptr_t)q >= limit || (ptr_t)q < base) {
-    	goto fail;
-    }
-    return(p);
-fail:
-    (*GC_same_obj_print_proc)((ptr_t)p, (ptr_t)q);
-    return(p);
-}
-
-#ifdef __STDC__
-void GC_default_is_valid_displacement_print_proc (GC_PTR p)
-#else
-void GC_default_is_valid_displacement_print_proc (p)
-GC_PTR p;
-#endif
-{
-    GC_err_printf1("0x%lx does not point to valid object displacement\n",
-    		   (unsigned long)p);
-    ABORT("GC_is_valid_displacement test failed");
-}
-
-void (*GC_is_valid_displacement_print_proc) GC_PROTO((GC_PTR)) = 
-	GC_default_is_valid_displacement_print_proc;
-
-/* Check that if p is a pointer to a heap page, then it points to	*/
-/* a valid displacement within a heap object.				*/
-/* Uninteresting with GC_all_interior_pointers.				*/
-/* Always returns its argument.						*/
-/* Note that we don't lock, since nothing relevant about the header	*/
-/* should change while we have a valid object pointer to the block.	*/
-#ifdef __STDC__
-  void * GC_is_valid_displacement(void *p)
-#else
-  char *GC_is_valid_displacement(p)
-  char *p;
-#endif
-{
-    register hdr *hhdr;
-    register word pdispl;
-    register struct hblk *h;
-    register map_entry_type map_entry;
-    register word sz;
-    
-    if (!GC_is_initialized) GC_init();
-    hhdr = HDR((word)p);
-    if (hhdr == 0) return(p);
-    h = HBLKPTR(p);
-    if (GC_all_interior_pointers) {
-	while (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-	   h = FORWARDED_ADDR(h, hhdr);
-	   hhdr = HDR(h);
-	}
-    }
-    if (IS_FORWARDING_ADDR_OR_NIL(hhdr)) {
-    	goto fail;
-    }
-    sz = WORDS_TO_BYTES(hhdr -> hb_sz);
-    pdispl = HBLKDISPL(p);
-    map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);
-    if (map_entry == OBJ_INVALID
-    	|| sz > MAXOBJBYTES && (ptr_t)p >= (ptr_t)h + sz) {
-    	goto fail;
-    }
-    return(p);
-fail:
-    (*GC_is_valid_displacement_print_proc)((ptr_t)p);
-    return(p);
-}
-
-#ifdef __STDC__
-void GC_default_is_visible_print_proc(GC_PTR p)
-#else
-void GC_default_is_visible_print_proc(p)
-GC_PTR p;
-#endif
-{
-    GC_err_printf1("0x%lx is not a GC visible pointer location\n",
-    		   (unsigned long)p);
-    ABORT("GC_is_visible test failed");
-}
-
-void (*GC_is_visible_print_proc) GC_PROTO((GC_PTR p)) = 
-	GC_default_is_visible_print_proc;
-
-/* Could p be a stack address? */
-GC_bool GC_on_stack(p)
-ptr_t p;
-{
-#   ifdef THREADS
-	return(TRUE);
-#   else
-	int dummy;
-#   	ifdef STACK_GROWS_DOWN
-	    if ((ptr_t)p >= (ptr_t)(&dummy) && (ptr_t)p < GC_stackbottom ) {
-	    	return(TRUE);
-	    }
-#	else
-	    if ((ptr_t)p <= (ptr_t)(&dummy) && (ptr_t)p > GC_stackbottom ) {
-	    	return(TRUE);
-	    }
-#	endif
-	return(FALSE);
-#   endif
-}
-
-/* Check that p is visible						*/
-/* to the collector as a possibly pointer containing location.		*/
-/* If it isn't invoke *GC_is_visible_print_proc.			*/
-/* Returns the argument in all cases.  May erroneously succeed		*/
-/* in hard cases.  (This is intended for debugging use with		*/
-/* untyped allocations.  The idea is that it should be possible, though	*/
-/* slow, to add such a call to all indirect pointer stores.)		*/
-/* Currently useless for multithreaded worlds.				*/
-#ifdef __STDC__
-  void * GC_is_visible(void *p)
-#else
-  char *GC_is_visible(p)
-  char *p;
-#endif
-{
-    register hdr *hhdr;
-    
-    if ((word)p & (ALIGNMENT - 1)) goto fail;
-    if (!GC_is_initialized) GC_init();
-#   ifdef THREADS
-	hhdr = HDR((word)p);
-        if (hhdr != 0 && GC_base(p) == 0) {
-            goto fail;
-        } else {
-            /* May be inside thread stack.  We can't do much. */
-            return(p);
-        }
-#   else
-	/* Check stack first: */
-	  if (GC_on_stack(p)) return(p);
-	hhdr = HDR((word)p);
-    	if (hhdr == 0) {
-    	    GC_bool result;
-    	    
-    	    if (GC_is_static_root(p)) return(p);
-    	    /* Else do it again correctly:	*/
-#           if (defined(DYNAMIC_LOADING) || defined(MSWIN32) || \
-		defined(MSWINCE) || defined (CYGWIN32) || defined(PCR)) \
-                && !defined(SRC_M3)
-    	        DISABLE_SIGNALS();
-    	        GC_register_dynamic_libraries();
-    	        result = GC_is_static_root(p);
-    	        ENABLE_SIGNALS();
-    	        if (result) return(p);
-#	    endif
-    	    goto fail;
-    	} else {
-    	    /* p points to the heap. */
-    	    word descr;
-    	    ptr_t base = GC_base(p);	/* Should be manually inlined? */
-    	    
-    	    if (base == 0) goto fail;
-    	    if (HBLKPTR(base) != HBLKPTR(p)) hhdr = HDR((word)p);
-    	    descr = hhdr -> hb_descr;
-    retry:
-    	    switch(descr & GC_DS_TAGS) {
-    	        case GC_DS_LENGTH:
-    	            if ((word)((ptr_t)p - (ptr_t)base) > (word)descr) goto fail;
-    	            break;
-    	        case GC_DS_BITMAP:
-    	            if ((ptr_t)p - (ptr_t)base
-    	                 >= WORDS_TO_BYTES(BITMAP_BITS)
-    	                 || ((word)p & (sizeof(word) - 1))) goto fail;
-    	            if (!((1 << (WORDSZ - ((ptr_t)p - (ptr_t)base) - 1))
-    	            	  & descr)) goto fail;
-    	            break;
-    	        case GC_DS_PROC:
-    	            /* We could try to decipher this partially. 	*/
-    	            /* For now we just punt.				*/
-    	            break;
-    	        case GC_DS_PER_OBJECT:
-		    if ((signed_word)descr >= 0) {
-    	              descr = *(word *)((ptr_t)base + (descr & ~GC_DS_TAGS));
-		    } else {
-		      ptr_t type_descr = *(ptr_t *)base;
-		      descr = *(word *)(type_descr
-			      - (descr - (GC_DS_PER_OBJECT
-					  - GC_INDIR_PER_OBJ_BIAS)));
-		    }
-    	            goto retry;
-    	    }
-    	    return(p);
-    	}
-#   endif
-fail:
-    (*GC_is_visible_print_proc)((ptr_t)p);
-    return(p);
-}
-
-
-GC_PTR GC_pre_incr (p, how_much)
-GC_PTR *p;
-size_t how_much;
-{
-    GC_PTR initial = *p;
-    GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);
-    
-    if (!GC_all_interior_pointers) {
-    	(void) GC_is_valid_displacement(result);
-    }
-    return (*p = result);
-}
-
-GC_PTR GC_post_incr (p, how_much)
-GC_PTR *p;
-size_t how_much;
-{
-    GC_PTR initial = *p;
-    GC_PTR result = GC_same_obj((GC_PTR)((word)initial + how_much), initial);
- 
-    if (!GC_all_interior_pointers) {
-    	(void) GC_is_valid_displacement(result);
-    }
-    *p = result;
-    return(initial);
-}
diff --git a/boehm-gc/real_malloc.c b/boehm-gc/real_malloc.c
deleted file mode 100644
index dece9fdc09c..00000000000
--- a/boehm-gc/real_malloc.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, May 19, 1994 2:04 pm PDT */
-
-
-# ifdef PCR
-/*
- * This definition should go in its own file that includes no other
- * header files.  Otherwise, we risk not getting the underlying system
- * malloc.
- */
-# define PCR_NO_RENAME
-# include <stdlib.h>
-
-# ifdef __STDC__
-    char * real_malloc(size_t size)
-# else 
-    char * real_malloc()
-    int size;
-# endif
-{
-    return((char *)malloc(size));
-}
-#endif /* PCR */
-
diff --git a/boehm-gc/reclaim.c b/boehm-gc/reclaim.c
deleted file mode 100644
index 864c0cad8af..00000000000
--- a/boehm-gc/reclaim.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
- * Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include <stdio.h>
-#include "private/gc_priv.h"
-
-signed_word GC_mem_found = 0;
-			/* Number of words of memory reclaimed     */
-
-#if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-  word GC_fl_builder_count = 0;
-	/* Number of threads currently building free lists without 	*/
-	/* holding GC lock.  It is not safe to collect if this is 	*/
-	/* nonzero.							*/
-#endif /* PARALLEL_MARK */
-
-/* We defer printing of leaked objects until we're done with the GC	*/
-/* cycle, since the routine for printing objects needs to run outside	*/
-/* the collector, e.g. without the allocation lock.			*/
-#define MAX_LEAKED 40
-ptr_t GC_leaked[MAX_LEAKED];
-unsigned GC_n_leaked = 0;
-
-GC_bool GC_have_errors = FALSE;
-
-void GC_add_leaked(leaked)
-ptr_t leaked;
-{
-    if (GC_n_leaked < MAX_LEAKED) {
-      GC_have_errors = TRUE;
-      GC_leaked[GC_n_leaked++] = leaked;
-      /* Make sure it's not reclaimed this cycle */
-        GC_set_mark_bit(leaked);
-    }
-}
-
-static GC_bool printing_errors = FALSE;
-/* Print all objects on the list after printing any smashed objs. 	*/
-/* Clear both lists.							*/
-void GC_print_all_errors ()
-{
-    unsigned i;
-
-    LOCK();
-    if (printing_errors) {
-	UNLOCK();
-	return;
-    }
-    printing_errors = TRUE;
-    UNLOCK();
-    if (GC_debugging_started) GC_print_all_smashed();
-    for (i = 0; i < GC_n_leaked; ++i) {
-	ptr_t p = GC_leaked[i];
-	if (HDR(p) -> hb_obj_kind == PTRFREE) {
-	    GC_err_printf0("Leaked atomic object at ");
-	} else {
-	    GC_err_printf0("Leaked composite object at ");
-	}
-	GC_print_heap_obj(p);
-	GC_err_printf0("\n");
-	GC_free(p);
-	GC_leaked[i] = 0;
-    }
-    GC_n_leaked = 0;
-    printing_errors = FALSE;
-}
-
-
-#   define FOUND_FREE(hblk, word_no) \
-      { \
-         GC_add_leaked((ptr_t)hblk + WORDS_TO_BYTES(word_no)); \
-      }
-
-/*
- * reclaim phase
- *
- */
-
-
-/*
- * Test whether a block is completely empty, i.e. contains no marked
- * objects.  This does not require the block to be in physical
- * memory.
- */
- 
-GC_bool GC_block_empty(hhdr)
-register hdr * hhdr;
-{
-    /* We treat hb_marks as an array of words here, even if it is 	*/
-    /* actually an array of bytes.  Since we only check for zero, there	*/
-    /* are no endian-ness issues.					*/
-    register word *p = (word *)(&(hhdr -> hb_marks[0]));
-    register word * plim =
-	    (word *)(&(hhdr -> hb_marks[MARK_BITS_SZ]));
-    while (p < plim) {
-	if (*p++) return(FALSE);
-    }
-    return(TRUE);
-}
-
-/* The following functions sometimes return a DONT_KNOW value. */
-#define DONT_KNOW  2
-
-#ifdef SMALL_CONFIG
-# define GC_block_nearly_full1(hhdr, pat1) DONT_KNOW
-# define GC_block_nearly_full3(hhdr, pat1, pat2) DONT_KNOW
-# define GC_block_nearly_full(hhdr) DONT_KNOW
-#endif
-
-#if !defined(SMALL_CONFIG) && defined(USE_MARK_BYTES)
-
-# define GC_block_nearly_full1(hhdr, pat1) GC_block_nearly_full(hhdr)
-# define GC_block_nearly_full3(hhdr, pat1, pat2) GC_block_nearly_full(hhdr)
-
- 
-GC_bool GC_block_nearly_full(hhdr)
-register hdr * hhdr;
-{
-    /* We again treat hb_marks as an array of words, even though it	*/
-    /* isn't.  We first sum up all the words, resulting in a word 	*/
-    /* containing 4 or 8 separate partial sums. 			*/
-    /* We then sum the bytes in the word of partial sums.		*/
-    /* This is still endian independant.  This fails if the partial	*/
-    /* sums can overflow.						*/
-#   if (BYTES_TO_WORDS(MARK_BITS_SZ)) >= 256
-	--> potential overflow; fix the code
-#   endif
-    register word *p = (word *)(&(hhdr -> hb_marks[0]));
-    register word * plim =
-	    (word *)(&(hhdr -> hb_marks[MARK_BITS_SZ]));
-    word sum_vector = 0;
-    unsigned sum;
-    while (p < plim) {
-	sum_vector += *p;
-	++p;
-    }
-    sum = 0;
-    while (sum_vector > 0) {
-	sum += sum_vector & 0xff;
-	sum_vector >>= 8;
-    }
-    return (sum > BYTES_TO_WORDS(7*HBLKSIZE/8)/(hhdr -> hb_sz));
-}
-#endif  /* USE_MARK_BYTES */
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-
-/*
- * Test whether nearly all of the mark words consist of the same
- * repeating pattern.
- */
-#define FULL_THRESHOLD (MARK_BITS_SZ/16)
-
-GC_bool GC_block_nearly_full1(hhdr, pat1)
-hdr *hhdr;
-word pat1;
-{
-    unsigned i;
-    unsigned misses = 0;
-    GC_ASSERT((MARK_BITS_SZ & 1) == 0);
-    for (i = 0; i < MARK_BITS_SZ; ++i) {
-	if ((hhdr -> hb_marks[i] | ~pat1) != ONES) {
-	    if (++misses > FULL_THRESHOLD) return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-/*
- * Test whether the same repeating 3 word pattern occurs in nearly
- * all the mark bit slots.
- * This is used as a heuristic, so we're a bit sloppy and ignore
- * the last one or two words.
- */
-GC_bool GC_block_nearly_full3(hhdr, pat1, pat2, pat3)
-hdr *hhdr;
-word pat1, pat2, pat3;
-{
-    unsigned i;
-    unsigned misses = 0;
-
-    if (MARK_BITS_SZ < 4) {
-      return DONT_KNOW;
-    }
-    for (i = 0; i < MARK_BITS_SZ - 2; i += 3) {
-	if ((hhdr -> hb_marks[i] | ~pat1) != ONES) {
-	    if (++misses > FULL_THRESHOLD) return FALSE;
-	}
-	if ((hhdr -> hb_marks[i+1] | ~pat2) != ONES) {
-	    if (++misses > FULL_THRESHOLD) return FALSE;
-	}
-	if ((hhdr -> hb_marks[i+2] | ~pat3) != ONES) {
-	    if (++misses > FULL_THRESHOLD) return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-/* Check whether a small object block is nearly full by looking at only */
-/* the mark bits.							*/
-/* We manually precomputed the mark bit patterns that need to be 	*/
-/* checked for, and we give up on the ones that are unlikely to occur,	*/
-/* or have period > 3.							*/
-/* This would be a lot easier with a mark bit per object instead of per	*/
-/* word, but that would rewuire computing object numbers in the mark	*/
-/* loop, which would require different data structures ...		*/
-GC_bool GC_block_nearly_full(hhdr)
-hdr *hhdr;
-{
-    int sz = hhdr -> hb_sz;
-
-#   if CPP_WORDSZ != 32 && CPP_WORDSZ != 64
-      return DONT_KNOW;	/* Shouldn't be used in any standard config.	*/
-#   endif
-#   if CPP_WORDSZ == 32
-      switch(sz) {
-        case 1:
-	  return GC_block_nearly_full1(hhdr, 0xffffffffl);
-	case 2:
-	  return GC_block_nearly_full1(hhdr, 0x55555555l);
-	case 4:
-	  return GC_block_nearly_full1(hhdr, 0x11111111l);
-	case 6:
-	  return GC_block_nearly_full3(hhdr, 0x41041041l,
-					      0x10410410l,
-					       0x04104104l);
-	case 8:
-	  return GC_block_nearly_full1(hhdr, 0x01010101l);
-	case 12:
-	  return GC_block_nearly_full3(hhdr, 0x01001001l,
-					      0x10010010l,
-					       0x00100100l);
-	case 16:
-	  return GC_block_nearly_full1(hhdr, 0x00010001l);
-	case 32:
-	  return GC_block_nearly_full1(hhdr, 0x00000001l);
-	default:
-	  return DONT_KNOW;
-      }
-#   endif
-#   if CPP_WORDSZ == 64
-      switch(sz) {
-        case 1:
-	  return GC_block_nearly_full1(hhdr, 0xffffffffffffffffl);
-	case 2:
-	  return GC_block_nearly_full1(hhdr, 0x5555555555555555l);
-	case 4:
-	  return GC_block_nearly_full1(hhdr, 0x1111111111111111l);
-	case 6:
-	  return GC_block_nearly_full3(hhdr, 0x1041041041041041l,
-					       0x4104104104104104l,
-					         0x0410410410410410l);
-	case 8:
-	  return GC_block_nearly_full1(hhdr, 0x0101010101010101l);
-	case 12:
-	  return GC_block_nearly_full3(hhdr, 0x1001001001001001l,
-					       0x0100100100100100l,
-					         0x0010010010010010l);
-	case 16:
-	  return GC_block_nearly_full1(hhdr, 0x0001000100010001l);
-	case 32:
-	  return GC_block_nearly_full1(hhdr, 0x0000000100000001l);
-	default:
-	  return DONT_KNOW;
-      }
-#   endif
-}
-#endif /* !SMALL_CONFIG  && !USE_MARK_BYTES */
-
-/* We keep track of reclaimed memory if we are either asked to, or	*/
-/* we are using the parallel marker.  In the latter case, we assume	*/
-/* that most allocation goes through GC_malloc_many for scalability.	*/
-/* GC_malloc_many needs the count anyway.				*/
-# if defined(GATHERSTATS) || defined(PARALLEL_MARK)
-#   define INCR_WORDS(sz) n_words_found += (sz)
-#   define COUNT_PARAM , count
-#   define COUNT_ARG , count
-#   define COUNT_DECL signed_word * count;
-#   define NWORDS_DECL signed_word n_words_found = 0;
-#   define COUNT_UPDATE *count += n_words_found;
-#   define MEM_FOUND_ADDR , &GC_mem_found
-# else
-#   define INCR_WORDS(sz)
-#   define COUNT_PARAM
-#   define COUNT_ARG
-#   define COUNT_DECL
-#   define NWORDS_DECL
-#   define COUNT_UPDATE
-#   define MEM_FOUND_ADDR
-# endif
-/*
- * Restore unmarked small objects in h of size sz to the object
- * free list.  Returns the new list.
- * Clears unmarked objects.
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_clear(hbp, hhdr, sz, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-register hdr * hhdr;
-register ptr_t list;
-register word sz;
-COUNT_DECL
-{
-    register int word_no;
-    register word *p, *q, *plim;
-    NWORDS_DECL
-    
-    GC_ASSERT(hhdr == GC_find_header((ptr_t)hbp));
-    p = (word *)(hbp->hb_body);
-    word_no = 0;
-    plim = (word *)((((word)hbp) + HBLKSIZE)
-		   - WORDS_TO_BYTES(sz));
-
-    /* go through all words in block */
-	while( p <= plim )  {
-	    if( mark_bit_from_hdr(hhdr, word_no) ) {
-		p += sz;
-	    } else {
-		INCR_WORDS(sz);
-		/* object is available - put on list */
-		    obj_link(p) = list;
-		    list = ((ptr_t)p);
-		/* Clear object, advance p to next object in the process */
-		    q = p + sz;
-#		    ifdef USE_MARK_BYTES
-		      GC_ASSERT(!(sz & 1)
-				&& !((word)p & (2 * sizeof(word) - 1)));
-		      p[1] = 0;
-                      p += 2;
-                      while (p < q) {
-			CLEAR_DOUBLE(p);
-			p += 2;
-		      }
-#		    else
-                      p++; /* Skip link field */
-                      while (p < q) {
-			*p++ = 0;
-		      }
-#		    endif
-	    }
-	    word_no += sz;
-	}
-    COUNT_UPDATE
-    return(list);
-}
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-
-/*
- * A special case for 2 word composite objects (e.g. cons cells):
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_clear2(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
-    register word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p, *plim;
-    register word mark_word;
-    register int i;
-    NWORDS_DECL
-#   define DO_OBJ(start_displ) \
-	if (!(mark_word & ((word)1 << start_displ))) { \
-	    p[start_displ] = (word)list; \
-	    list = (ptr_t)(p+start_displ); \
-	    p[start_displ+1] = 0; \
-	    INCR_WORDS(2); \
-	}
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)(((word)hbp) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    for (i = 0; i < WORDSZ; i += 8) {
-		DO_OBJ(0);
-		DO_OBJ(2);
-		DO_OBJ(4);
-		DO_OBJ(6);
-		p += 8;
-		mark_word >>= 8;
-	    }
-	}	        
-    COUNT_UPDATE
-    return(list);
-#   undef DO_OBJ
-}
-
-/*
- * Another special case for 4 word composite objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_clear4(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
-    register word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p, *plim;
-    register word mark_word;
-    NWORDS_DECL
-#   define DO_OBJ(start_displ) \
-	if (!(mark_word & ((word)1 << start_displ))) { \
-	    p[start_displ] = (word)list; \
-	    list = (ptr_t)(p+start_displ); \
-	    p[start_displ+1] = 0; \
-	    CLEAR_DOUBLE(p + start_displ + 2); \
-	    INCR_WORDS(4); \
-	}
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)(((word)hbp) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    DO_OBJ(0);
-	    DO_OBJ(4);
-	    DO_OBJ(8);
-	    DO_OBJ(12);
-	    DO_OBJ(16);
-	    DO_OBJ(20);
-	    DO_OBJ(24);
-	    DO_OBJ(28);
-#	    if CPP_WORDSZ == 64
-	      DO_OBJ(32);
-	      DO_OBJ(36);
-	      DO_OBJ(40);
-	      DO_OBJ(44);
-	      DO_OBJ(48);
-	      DO_OBJ(52);
-	      DO_OBJ(56);
-	      DO_OBJ(60);
-#	    endif
-	    p += WORDSZ;
-	}	        
-    COUNT_UPDATE
-    return(list);
-#   undef DO_OBJ
-}
-
-#endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
-
-/* The same thing, but don't clear objects: */
-/*ARGSUSED*/
-ptr_t GC_reclaim_uninit(hbp, hhdr, sz, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-register hdr * hhdr;
-register ptr_t list;
-register word sz;
-COUNT_DECL
-{
-    register int word_no = 0;
-    register word *p, *plim;
-    NWORDS_DECL
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)((((word)hbp) + HBLKSIZE)
-		   - WORDS_TO_BYTES(sz));
-
-    /* go through all words in block */
-	while( p <= plim )  {
-	    if( !mark_bit_from_hdr(hhdr, word_no) ) {
-		INCR_WORDS(sz);
-		/* object is available - put on list */
-		    obj_link(p) = list;
-		    list = ((ptr_t)p);
-	    }
-	    p += sz;
-	    word_no += sz;
-	}
-    COUNT_UPDATE
-    return(list);
-}
-
-/* Don't really reclaim objects, just check for unmarked ones: */
-/*ARGSUSED*/
-void GC_reclaim_check(hbp, hhdr, sz)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-register hdr * hhdr;
-register word sz;
-{
-    register int word_no = 0;
-    register word *p, *plim;
-#   ifdef GATHERSTATS
-        register int n_words_found = 0;
-#   endif
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)((((word)hbp) + HBLKSIZE)
-		   - WORDS_TO_BYTES(sz));
-
-    /* go through all words in block */
-	while( p <= plim )  {
-	    if( !mark_bit_from_hdr(hhdr, word_no) ) {
-		FOUND_FREE(hbp, word_no);
-	    }
-	    p += sz;
-	    word_no += sz;
-	}
-}
-
-#if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-/*
- * Another special case for 2 word atomic objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_uninit2(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
-    register word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p, *plim;
-    register word mark_word;
-    register int i;
-    NWORDS_DECL
-#   define DO_OBJ(start_displ) \
-	if (!(mark_word & ((word)1 << start_displ))) { \
-	    p[start_displ] = (word)list; \
-	    list = (ptr_t)(p+start_displ); \
-	    INCR_WORDS(2); \
-	}
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)(((word)hbp) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    for (i = 0; i < WORDSZ; i += 8) {
-		DO_OBJ(0);
-		DO_OBJ(2);
-		DO_OBJ(4);
-		DO_OBJ(6);
-		p += 8;
-		mark_word >>= 8;
-	    }
-	}	        
-    COUNT_UPDATE
-    return(list);
-#   undef DO_OBJ
-}
-
-/*
- * Another special case for 4 word atomic objects:
- */
-/*ARGSUSED*/
-ptr_t GC_reclaim_uninit4(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
-    register word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p, *plim;
-    register word mark_word;
-    NWORDS_DECL
-#   define DO_OBJ(start_displ) \
-	if (!(mark_word & ((word)1 << start_displ))) { \
-	    p[start_displ] = (word)list; \
-	    list = (ptr_t)(p+start_displ); \
-	    INCR_WORDS(4); \
-	}
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)(((word)hbp) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    DO_OBJ(0);
-	    DO_OBJ(4);
-	    DO_OBJ(8);
-	    DO_OBJ(12);
-	    DO_OBJ(16);
-	    DO_OBJ(20);
-	    DO_OBJ(24);
-	    DO_OBJ(28);
-#	    if CPP_WORDSZ == 64
-	      DO_OBJ(32);
-	      DO_OBJ(36);
-	      DO_OBJ(40);
-	      DO_OBJ(44);
-	      DO_OBJ(48);
-	      DO_OBJ(52);
-	      DO_OBJ(56);
-	      DO_OBJ(60);
-#	    endif
-	    p += WORDSZ;
-	}	        
-    COUNT_UPDATE
-    return(list);
-#   undef DO_OBJ
-}
-
-/* Finally the one word case, which never requires any clearing: */
-/*ARGSUSED*/
-ptr_t GC_reclaim1(hbp, hhdr, list COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-register ptr_t list;
-COUNT_DECL
-{
-    register word * mark_word_addr = &(hhdr->hb_marks[0]);
-    register word *p, *plim;
-    register word mark_word;
-    register int i;
-    NWORDS_DECL
-#   define DO_OBJ(start_displ) \
-	if (!(mark_word & ((word)1 << start_displ))) { \
-	    p[start_displ] = (word)list; \
-	    list = (ptr_t)(p+start_displ); \
-	    INCR_WORDS(1); \
-	}
-    
-    p = (word *)(hbp->hb_body);
-    plim = (word *)(((word)hbp) + HBLKSIZE);
-
-    /* go through all words in block */
-	while( p < plim )  {
-	    mark_word = *mark_word_addr++;
-	    for (i = 0; i < WORDSZ; i += 4) {
-		DO_OBJ(0);
-		DO_OBJ(1);
-		DO_OBJ(2);
-		DO_OBJ(3);
-		p += 4;
-		mark_word >>= 4;
-	    }
-	}	        
-    COUNT_UPDATE
-    return(list);
-#   undef DO_OBJ
-}
-
-#endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
-
-/*
- * Generic procedure to rebuild a free list in hbp.
- * Also called directly from GC_malloc_many.
- */
-ptr_t GC_reclaim_generic(hbp, hhdr, sz, init, list COUNT_PARAM)
-struct hblk *hbp;	/* ptr to current heap block		*/
-hdr * hhdr;
-GC_bool init;
-ptr_t list;
-word sz;
-COUNT_DECL
-{
-    ptr_t result = list;
-
-    GC_ASSERT(GC_find_header((ptr_t)hbp) == hhdr);
-    GC_remove_protection(hbp, 1, (hhdr)->hb_descr == 0 /* Pointer-free? */);
-    if (init) {
-      switch(sz) {
-#      if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-        case 1:
-	    /* We now issue the hint even if GC_nearly_full returned	*/
-	    /* DONT_KNOW.						*/
-            result = GC_reclaim1(hbp, hhdr, list COUNT_ARG);
-            break;
-        case 2:
-            result = GC_reclaim_clear2(hbp, hhdr, list COUNT_ARG);
-            break;
-        case 4:
-            result = GC_reclaim_clear4(hbp, hhdr, list COUNT_ARG);
-            break;
-#      endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
-        default:
-            result = GC_reclaim_clear(hbp, hhdr, sz, list COUNT_ARG);
-            break;
-      }
-    } else {
-      GC_ASSERT((hhdr)->hb_descr == 0 /* Pointer-free block */);
-      switch(sz) {
-#      if !defined(SMALL_CONFIG) && !defined(USE_MARK_BYTES)
-        case 1:
-            result = GC_reclaim1(hbp, hhdr, list COUNT_ARG);
-            break;
-        case 2:
-            result = GC_reclaim_uninit2(hbp, hhdr, list COUNT_ARG);
-            break;
-        case 4:
-            result = GC_reclaim_uninit4(hbp, hhdr, list COUNT_ARG);
-            break;
-#      endif /* !SMALL_CONFIG && !USE_MARK_BYTES */
-        default:
-            result = GC_reclaim_uninit(hbp, hhdr, sz, list COUNT_ARG);
-            break;
-      }
-    } 
-    if (IS_UNCOLLECTABLE(hhdr -> hb_obj_kind)) GC_set_hdr_marks(hhdr);
-    return result;
-}
-
-/*
- * Restore unmarked small objects in the block pointed to by hbp
- * to the appropriate object free list.
- * If entirely empty blocks are to be completely deallocated, then
- * caller should perform that check.
- */
-void GC_reclaim_small_nonempty_block(hbp, report_if_found COUNT_PARAM)
-register struct hblk *hbp;	/* ptr to current heap block		*/
-int report_if_found;		/* Abort if a reclaimable object is found */
-COUNT_DECL
-{
-    hdr *hhdr = HDR(hbp);
-    word sz = hhdr -> hb_sz;
-    int kind = hhdr -> hb_obj_kind;
-    struct obj_kind * ok = &GC_obj_kinds[kind];
-    ptr_t * flh = &(ok -> ok_freelist[sz]);
-    
-    hhdr -> hb_last_reclaimed = (unsigned short) GC_gc_no;
-
-    if (report_if_found) {
-	GC_reclaim_check(hbp, hhdr, sz);
-    } else {
-        *flh = GC_reclaim_generic(hbp, hhdr, sz,
-				  (ok -> ok_init || GC_debugging_started),
-	 			  *flh MEM_FOUND_ADDR);
-    }
-}
-
-/*
- * Restore an unmarked large object or an entirely empty blocks of small objects
- * to the heap block free list.
- * Otherwise enqueue the block for later processing
- * by GC_reclaim_small_nonempty_block.
- * If report_if_found is TRUE, then process any block immediately, and
- * simply report free objects; do not actually reclaim them.
- */
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_reclaim_block(register struct hblk *hbp, word report_if_found)
-# else
-    void GC_reclaim_block(hbp, report_if_found)
-    register struct hblk *hbp;	/* ptr to current heap block		*/
-    word report_if_found;	/* Abort if a reclaimable object is found */
-# endif
-{
-    register hdr * hhdr;
-    register word sz;		/* size of objects in current block	*/
-    register struct obj_kind * ok;
-    struct hblk ** rlh;
-
-    hhdr = HDR(hbp);
-    sz = hhdr -> hb_sz;
-    ok = &GC_obj_kinds[hhdr -> hb_obj_kind];
-
-    if( sz > MAXOBJSZ ) {  /* 1 big object */
-        if( !mark_bit_from_hdr(hhdr, 0) ) {
-	    if (report_if_found) {
-	      FOUND_FREE(hbp, 0);
-	    } else {
-	      word blocks = OBJ_SZ_TO_BLOCKS(sz);
-	      if (blocks > 1) {
-	        GC_large_allocd_bytes -= blocks * HBLKSIZE;
-	      }
-#	      ifdef GATHERSTATS
-	        GC_mem_found += sz;
-#	      endif
-	      GC_freehblk(hbp);
-	    }
-	}
-    } else {
-        GC_bool empty = GC_block_empty(hhdr);
-        if (report_if_found) {
-    	  GC_reclaim_small_nonempty_block(hbp, (int)report_if_found
-					  MEM_FOUND_ADDR);
-        } else if (empty) {
-#	  ifdef GATHERSTATS
-            GC_mem_found += BYTES_TO_WORDS(HBLKSIZE);
-#	  endif
-          GC_freehblk(hbp);
-        } else if (TRUE != GC_block_nearly_full(hhdr)){
-          /* group of smaller objects, enqueue the real work */
-          rlh = &(ok -> ok_reclaim_list[sz]);
-          hhdr -> hb_next = *rlh;
-          *rlh = hbp;
-        } /* else not worth salvaging. */
-	/* We used to do the nearly_full check later, but we 	*/
-	/* already have the right cache context here.  Also	*/
-	/* doing it here avoids some silly lock contention in	*/
-	/* GC_malloc_many.					*/
-    }
-}
-
-#if !defined(NO_DEBUGGING)
-/* Routines to gather and print heap block info 	*/
-/* intended for debugging.  Otherwise should be called	*/
-/* with lock.						*/
-
-struct Print_stats
-{
-	size_t number_of_blocks;
-	size_t total_bytes;
-};
-
-#ifdef USE_MARK_BYTES
-
-/* Return the number of set mark bits in the given header	*/
-int GC_n_set_marks(hhdr)
-hdr * hhdr;
-{
-    register int result = 0;
-    register int i;
-    
-    for (i = 0; i < MARK_BITS_SZ; i++) {
-        result += hhdr -> hb_marks[i];
-    }
-    return(result);
-}
-
-#else
-
-/* Number of set bits in a word.  Not performance critical.	*/
-static int set_bits(n)
-word n;
-{
-    register word m = n;
-    register int result = 0;
-    
-    while (m > 0) {
-    	if (m & 1) result++;
-    	m >>= 1;
-    }
-    return(result);
-}
-
-/* Return the number of set mark bits in the given header	*/
-int GC_n_set_marks(hhdr)
-hdr * hhdr;
-{
-    register int result = 0;
-    register int i;
-    
-    for (i = 0; i < MARK_BITS_SZ; i++) {
-        result += set_bits(hhdr -> hb_marks[i]);
-    }
-    return(result);
-}
-
-#endif /* !USE_MARK_BYTES  */
-
-/*ARGSUSED*/
-# if defined(__STDC__) || defined(__cplusplus)
-    void GC_print_block_descr(struct hblk *h, word dummy)
-# else
-    void GC_print_block_descr(h, dummy)
-    struct hblk *h;
-    word dummy;
-# endif
-{
-    register hdr * hhdr = HDR(h);
-    register size_t bytes = WORDS_TO_BYTES(hhdr -> hb_sz);
-    struct Print_stats *ps;
-    
-    GC_printf3("(%lu:%lu,%lu)", (unsigned long)(hhdr -> hb_obj_kind),
-    			        (unsigned long)bytes,
-    			        (unsigned long)(GC_n_set_marks(hhdr)));
-    bytes += HBLKSIZE-1;
-    bytes &= ~(HBLKSIZE-1);
-
-    ps = (struct Print_stats *)dummy;
-    ps->total_bytes += bytes;
-    ps->number_of_blocks++;
-}
-
-void GC_print_block_list()
-{
-    struct Print_stats pstats;
-
-    GC_printf1("(kind(0=ptrfree,1=normal,2=unc.,%lu=stubborn):size_in_bytes, #_marks_set)\n", STUBBORN);
-    pstats.number_of_blocks = 0;
-    pstats.total_bytes = 0;
-    GC_apply_to_all_blocks(GC_print_block_descr, (word)&pstats);
-    GC_printf2("\nblocks = %lu, bytes = %lu\n",
-    	       (unsigned long)pstats.number_of_blocks,
-    	       (unsigned long)pstats.total_bytes);
-}
-
-#endif /* NO_DEBUGGING */
-
-/*
- * Clear all obj_link pointers in the list of free objects *flp.
- * Clear *flp.
- * This must be done before dropping a list of free gcj-style objects,
- * since may otherwise end up with dangling "descriptor" pointers.
- * It may help for other pointer-containing objects.
- */
-void GC_clear_fl_links(flp)
-ptr_t *flp;
-{
-    ptr_t next = *flp;
-
-    while (0 != next) {
-       *flp = 0;
-       flp = &(obj_link(next));
-       next = *flp;
-    }
-}
-
-/*
- * Perform GC_reclaim_block on the entire heap, after first clearing
- * small object free lists (if we are not just looking for leaks).
- */
-void GC_start_reclaim(report_if_found)
-int report_if_found;		/* Abort if a GC_reclaimable object is found */
-{
-    int kind;
-    
-#   if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-      GC_ASSERT(0 == GC_fl_builder_count);
-#   endif
-    /* Clear reclaim- and free-lists */
-      for (kind = 0; kind < GC_n_kinds; kind++) {
-        ptr_t *fop;
-        ptr_t *lim;
-        struct hblk ** rlp;
-        struct hblk ** rlim;
-        struct hblk ** rlist = GC_obj_kinds[kind].ok_reclaim_list;
-	GC_bool should_clobber = (GC_obj_kinds[kind].ok_descriptor != 0);
-        
-        if (rlist == 0) continue;	/* This kind not used.	*/
-        if (!report_if_found) {
-            lim = &(GC_obj_kinds[kind].ok_freelist[MAXOBJSZ+1]);
-	    for( fop = GC_obj_kinds[kind].ok_freelist; fop < lim; fop++ ) {
-	      if (*fop != 0) {
-		if (should_clobber) {
-		  GC_clear_fl_links(fop);
-		} else {
-	          *fop = 0;
-		}
-	      }
-	    }
-	} /* otherwise free list objects are marked, 	*/
-	  /* and its safe to leave them			*/
-	rlim = rlist + MAXOBJSZ+1;
-	for( rlp = rlist; rlp < rlim; rlp++ ) {
-	    *rlp = 0;
-	}
-      }
-    
-#   ifdef PRINTBLOCKS
-        GC_printf0("GC_reclaim: current block sizes:\n");
-        GC_print_block_list();
-#   endif
-
-  /* Go through all heap blocks (in hblklist) and reclaim unmarked objects */
-  /* or enqueue the block for later processing.				   */
-    GC_apply_to_all_blocks(GC_reclaim_block, (word)report_if_found);
-
-# ifdef EAGER_SWEEP
-    /* This is a very stupid thing to do.  We make it possible anyway,	*/
-    /* so that you can convince yourself that it really is very stupid.	*/
-    GC_reclaim_all((GC_stop_func)0, FALSE);
-# endif
-# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
-    GC_ASSERT(0 == GC_fl_builder_count);
-# endif
-    
-}
-
-/*
- * Sweep blocks of the indicated object size and kind until either the
- * appropriate free list is nonempty, or there are no more blocks to
- * sweep.
- */
-void GC_continue_reclaim(sz, kind)
-word sz;	/* words */
-int kind;
-{
-    register hdr * hhdr;
-    register struct hblk * hbp;
-    register struct obj_kind * ok = &(GC_obj_kinds[kind]);
-    struct hblk ** rlh = ok -> ok_reclaim_list;
-    ptr_t *flh = &(ok -> ok_freelist[sz]);
-    
-    if (rlh == 0) return;	/* No blocks of this kind.	*/
-    rlh += sz;
-    while ((hbp = *rlh) != 0) {
-        hhdr = HDR(hbp);
-        *rlh = hhdr -> hb_next;
-        GC_reclaim_small_nonempty_block(hbp, FALSE MEM_FOUND_ADDR);
-        if (*flh != 0) break;
-    }
-}
-
-/*
- * Reclaim all small blocks waiting to be reclaimed.
- * Abort and return FALSE when/if (*stop_func)() returns TRUE.
- * If this returns TRUE, then it's safe to restart the world
- * with incorrectly cleared mark bits.
- * If ignore_old is TRUE, then reclaim only blocks that have been 
- * recently reclaimed, and discard the rest.
- * Stop_func may be 0.
- */
-GC_bool GC_reclaim_all(stop_func, ignore_old)
-GC_stop_func stop_func;
-GC_bool ignore_old;
-{
-    register word sz;
-    register int kind;
-    register hdr * hhdr;
-    register struct hblk * hbp;
-    register struct obj_kind * ok;
-    struct hblk ** rlp;
-    struct hblk ** rlh;
-#   ifdef PRINTTIMES
-	CLOCK_TYPE start_time;
-	CLOCK_TYPE done_time;
-	
-	GET_TIME(start_time);
-#   endif
-    
-    for (kind = 0; kind < GC_n_kinds; kind++) {
-    	ok = &(GC_obj_kinds[kind]);
-    	rlp = ok -> ok_reclaim_list;
-    	if (rlp == 0) continue;
-    	for (sz = 1; sz <= MAXOBJSZ; sz++) {
-    	    rlh = rlp + sz;
-    	    while ((hbp = *rlh) != 0) {
-    	        if (stop_func != (GC_stop_func)0 && (*stop_func)()) {
-    	            return(FALSE);
-    	        }
-        	hhdr = HDR(hbp);
-        	*rlh = hhdr -> hb_next;
-        	if (!ignore_old || hhdr -> hb_last_reclaimed == GC_gc_no - 1) {
-        	    /* It's likely we'll need it this time, too	*/
-        	    /* It's been touched recently, so this	*/
-        	    /* shouldn't trigger paging.		*/
-        	    GC_reclaim_small_nonempty_block(hbp, FALSE MEM_FOUND_ADDR);
-        	}
-            }
-        }
-    }
-#   ifdef PRINTTIMES
-	GET_TIME(done_time);
-	GC_printf1("Disposing of reclaim lists took %lu msecs\n",
-	           MS_TIME_DIFF(done_time,start_time));
-#   endif
-    return(TRUE);
-}
diff --git a/boehm-gc/rs6000_mach_dep.s b/boehm-gc/rs6000_mach_dep.s
deleted file mode 100644
index 12bf9a84d51..00000000000
--- a/boehm-gc/rs6000_mach_dep.s
+++ /dev/null
@@ -1,114 +0,0 @@
-    .set   r0,0
-    .set   r1,1
-    .set   r2,2
-    .set   r3,3
-    .set   r4,4
-    .set   r5,5
-    .set   r6,6
-    .set   r7,7
-    .set   r8,8
-    .set   r9,9
-    .set   r10,10
-    .set   r11,11
-    .set   r12,12
-    .set   r13,13
-    .set   r14,14
-    .set   r15,15
-    .set   r16,16
-    .set   r17,17
-    .set   r18,18
-    .set   r19,19
-    .set   r20,20
-    .set   r21,21
-    .set   r22,22
-    .set   r23,23
-    .set   r24,24
-    .set   r25,25
-    .set   r26,26
-    .set   r27,27
-    .set   r28,28
-    .set   r29,29
-    .set   r30,30
-    .set   r31,31
-
-    .extern .GC_push_one
- # Mark from machine registers that are saved by C compiler
-    .globl  .GC_push_regs
-.csect .text[PR]
-    .align 2
-    .globl  GC_push_regs
-    .globl  .GC_push_regs
-.csect GC_push_regs[DS]
-GC_push_regs:
-    .long .GC_push_regs, TOC[tc0], 0
-.csect .text[PR]
-.GC_push_regs:
-    stu	    r1,-64(r1)  # reserve stack frame
-    mflr    r0		# save link register
-    st      r0,0x48(r1)
-    oril    r3,r2,0x0   # mark from r2
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r13,0x0   # mark from r13-r31
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r14,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r15,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r16,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r17,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r18,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r19,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r20,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r21,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r22,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r23,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r24,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r25,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r26,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r27,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r28,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r29,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r30,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    oril    r3,r31,0x0
-    bl 	    .GC_push_one
-    cror    15,15,15
-    l       r0,0x48(r1)
-    mtlr    r0
-    ai      r1,r1,64
-    br
-    .long 0
-    .byte 0,0,0,0,0,0,0,0
diff --git a/boehm-gc/setjmp_t.c b/boehm-gc/setjmp_t.c
deleted file mode 100644
index 07686ef0808..00000000000
--- a/boehm-gc/setjmp_t.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
- 
-/* Check whether setjmp actually saves registers in jmp_buf. */
-/* If it doesn't, the generic mark_regs code won't work.     */
-/* Compilers vary as to whether they will put x in a 	     */
-/* (callee-save) register without -O.  The code is	     */
-/* contrived such that any decent compiler should put x in   */
-/* a callee-save register with -O.  Thus it is is 	     */
-/* recommended that this be run optimized.  (If the machine  */
-/* has no callee-save registers, then the generic code is    */
-/* safe, but this will not be noticed by this piece of       */
-/* code.)  This test appears to be far from perfect.	     */
-#include <stdio.h>
-#include <setjmp.h>
-#include <string.h>
-#include "private/gcconfig.h"
-
-#ifdef OS2
-/* GETPAGESIZE() is set to getpagesize() by default, but that	*/
-/* doesn't really exist, and the collector doesn't need it.	*/
-#define INCL_DOSFILEMGR
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#include <os2.h>
-
-int
-getpagesize()
-{
-    ULONG result[1];
-    
-    if (DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE,
-    		        (void *)result, sizeof(ULONG)) != NO_ERROR) {
-    	fprintf(stderr, "DosQuerySysInfo failed\n");
-    	result[0] = 4096;
-    }
-    return((int)(result[0]));
-}
-#endif
-
-struct {char a_a; char * a_b;} a;
-
-int * nested_sp()
-{
-    int dummy;
-    
-    return(&dummy);
-}
-
-main()
-{
-	int dummy;
-	long ps = GETPAGESIZE();
-	jmp_buf b;
-	register int x = (int)strlen("a");  /* 1, slightly disguised */
-	static int y = 0;
-
-	printf("This appears to be a %s running %s\n", MACH_TYPE, OS_TYPE);
-	if (nested_sp() < &dummy) {
-	  printf("Stack appears to grow down, which is the default.\n");
-	  printf("A good guess for STACKBOTTOM on this machine is 0x%lx.\n",
-	         ((unsigned long)(&dummy) + ps) & ~(ps-1));
-	} else {
-	  printf("Stack appears to grow up.\n");
-	  printf("Define STACK_GROWS_UP in gc_private.h\n");
-	  printf("A good guess for STACKBOTTOM on this machine is 0x%lx.\n",
-	         ((unsigned long)(&dummy) + ps) & ~(ps-1));
-	}
-	printf("Note that this may vary between machines of ostensibly\n");
-	printf("the same architecture (e.g. Sun 3/50s and 3/80s).\n");
-	printf("On many machines the value is not fixed.\n");
-	printf("A good guess for ALIGNMENT on this machine is %ld.\n",
-	       (unsigned long)(&(a.a_b))-(unsigned long)(&a));
-	
-	/* Encourage the compiler to keep x in a callee-save register */
-	x = 2*x-1;
-	printf("");
-	x = 2*x-1;
-	setjmp(b);
-	if (y == 1) {
-	    if (x == 2) {
-		printf("Generic mark_regs code probably wont work\n");
-#		if defined(SPARC) || defined(RS6000) || defined(VAX) || defined(MIPS) || defined(M68K) || defined(I386) || defined(NS32K) || defined(RT)
-		    printf("Assembly code supplied\n");
-#		else
-		    printf("Need assembly code\n");
-#		endif
-	    } else if (x == 1) {
-		printf("Generic mark_regs code may work\n");
-	    } else {
-		printf("Very strange setjmp implementation\n");
-	    }
-	}
-	y++;
-	x = 2;
-	if (y == 1) longjmp(b,1);
-	return(0);
-}
-
-int g(x)
-int x;
-{
-	return(x);
-}
diff --git a/boehm-gc/sparc_mach_dep.S b/boehm-gc/sparc_mach_dep.S
deleted file mode 100644
index 06a0f3b4673..00000000000
--- a/boehm-gc/sparc_mach_dep.S
+++ /dev/null
@@ -1,67 +0,0 @@
-!	SPARCompiler 3.0 and later apparently no longer handles
-!	asm outside functions.  So we need a separate .s file
-!	This is only set up for SunOS 5, not SunOS 4.
-!	Assumes this is called before the stack contents are
-!	examined.
-
-	.seg 	"text"
-	.globl	GC_save_regs_in_stack
-	.globl 	GC_push_regs
-GC_save_regs_in_stack:
-GC_push_regs:
-#if defined(__arch64__) || defined(__sparcv9)
-	save	%sp,-128,%sp
-	flushw
-	ret
-	  restore %sp,2047+128,%o0
-#else /* 32 bit SPARC */
-	ta	0x3   ! ST_FLUSH_WINDOWS
-	mov	%sp,%o0
-	retl
-	nop
-#endif /* 32 bit SPARC */
-.GC_save_regs_in_stack_end:
-	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack
-	
-
-	.globl	GC_clear_stack_inner
-GC_clear_stack_inner:
-#if defined(__arch64__) || defined(__sparcv9)
-	mov %sp,%o2		! Save sp
-	add %sp,2047-8,%o3	! p = sp+bias-8
-	add %o1,-2047-192,%sp	! Move sp out of the way,
-  				! so that traps still work.
-  				! Includes some extra words
-  				! so we can be sloppy below.
-loop:
-	stx %g0,[%o3]		! *(long *)p = 0
-	cmp %o3,%o1
-	bgu,pt %xcc, loop	! if (p > limit) goto loop
-          add %o3,-8,%o3	! p -= 8 (delay slot)
-	retl
-    	  mov %o2,%sp		! Restore sp., delay slot	
-#else  /* 32 bit SPARC */
-	mov	%sp,%o2		! Save sp
-	add	%sp,-8,%o3	! p = sp-8
-	clr	%g1		! [g0,g1] = 0
-	add	%o1,-0x60,%sp	! Move sp out of the way,
-				! so that traps still work.
-				! Includes some extra words
-				! so we can be sloppy below.
-loop:
-	std	%g0,[%o3]	! *(long long *)p = 0
-	cmp	%o3,%o1
-	bgu	loop		! if (p > limit) goto loop
-	  add	%o3,-8,%o3	! p -= 8 (delay slot)
-	retl
-	  mov	%o2,%sp		! Restore sp., delay slot
-#endif  /* 32 bit SPARC */
-.GC_clear_stack_inner_end:
-      	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner
-
-	
-		
-		
-		
-		
-	
diff --git a/boehm-gc/sparc_netbsd_mach_dep.s b/boehm-gc/sparc_netbsd_mach_dep.s
deleted file mode 100644
index bc3f1603735..00000000000
--- a/boehm-gc/sparc_netbsd_mach_dep.s
+++ /dev/null
@@ -1,34 +0,0 @@
-!	SPARCompiler 3.0 and later apparently no longer handles
-!	asm outside functions.  So we need a separate .s file
-!	This is only set up for SunOS 4.
-!	Assumes this is called before the stack contents are
-!	examined.
-
-#include "machine/asm.h"
-
-	.seg 	"text"
-	.globl	_C_LABEL(GC_save_regs_in_stack)
-	.globl 	_C_LABEL(GC_push_regs)
-_C_LABEL(GC_save_regs_in_stack):
-_C_LABEL(GC_push_regs):
-	ta	0x3   ! ST_FLUSH_WINDOWS
-	mov	%sp,%o0
-	retl
-	nop
-	
-	.globl	_C_LABEL(GC_clear_stack_inner)
-_C_LABEL(GC_clear_stack_inner):
-	mov	%sp,%o2		! Save sp
-	add	%sp,-8,%o3	! p = sp-8
-	clr	%g1		! [g0,g1] = 0
-	add	%o1,-0x60,%sp	! Move sp out of the way,
-				! so that traps still work.
-				! Includes some extra words
-				! so we can be sloppy below.
-loop:
-	std	%g0,[%o3]	! *(long long *)p = 0
-	cmp	%o3,%o1
-	bgu	loop		! if (p > limit) goto loop
-	add	%o3,-8,%o3	! p -= 8 (delay slot)
-	retl
-	mov	%o2,%sp		! Restore sp., delay slot
diff --git a/boehm-gc/sparc_sunos4_mach_dep.s b/boehm-gc/sparc_sunos4_mach_dep.s
deleted file mode 100644
index 41858073ef9..00000000000
--- a/boehm-gc/sparc_sunos4_mach_dep.s
+++ /dev/null
@@ -1,38 +0,0 @@
-!	SPARCompiler 3.0 and later apparently no longer handles
-!	asm outside functions.  So we need a separate .s file
-!	This is only set up for SunOS 4.
-!	Assumes this is called before the stack contents are
-!	examined.
-
-	.seg 	"text"
-	.globl	_GC_save_regs_in_stack
-	.globl 	_GC_push_regs
-_GC_save_regs_in_stack:
-_GC_push_regs:
-	ta	0x3   ! ST_FLUSH_WINDOWS
-	mov	%sp,%o0
-	retl
-	nop
-	
-	.globl	_GC_clear_stack_inner
-_GC_clear_stack_inner:
-	mov	%sp,%o2		! Save sp
-	add	%sp,-8,%o3	! p = sp-8
-	clr	%g1		! [g0,g1] = 0
-	add	%o1,-0x60,%sp	! Move sp out of the way,
-				! so that traps still work.
-				! Includes some extra words
-				! so we can be sloppy below.
-loop:
-	std	%g0,[%o3]	! *(long long *)p = 0
-	cmp	%o3,%o1
-	bgu	loop		! if (p > limit) goto loop
-	  add	%o3,-8,%o3	! p -= 8 (delay slot)
-	retl
-	  mov	%o2,%sp		! Restore sp., delay slot
-	
-		
-		
-		
-		
-	
diff --git a/boehm-gc/specific.c b/boehm-gc/specific.c
deleted file mode 100644
index e78cf7ac912..00000000000
--- a/boehm-gc/specific.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Copyright (c) 2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include "private/gc_priv.h" /* For GC_compare_and_exchange, GC_memory_barrier */
-
-#if defined(GC_LINUX_THREADS) || defined(GC_GNU_THREADS)
-
-#include "private/specific.h"
-
-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	*/
-			/* cache entries to avoid a check for 0.		*/
-
-int PREFIXED(key_create) (tsd ** key_ptr, void (* destructor)(void *)) {
-    int i;
-    tsd * result = (tsd *)MALLOC_CLEAR(sizeof (tsd));
-
-    /* A quick alignment check, since we need atomic stores */
-      GC_ASSERT((unsigned long)(&invalid_tse.next) % sizeof(tse *) == 0);
-    if (0 == result) return ENOMEM;
-    pthread_mutex_init(&(result -> lock), NULL);
-    for (i = 0; i < TS_CACHE_SIZE; ++i) {
-	result -> cache[i] = &invalid_tse;
-    }
-#   ifdef GC_ASSERTIONS
-      for (i = 0; i < TS_HASH_SIZE; ++i) {
-	GC_ASSERT(result -> hash[i] == 0);
-      }
-#   endif
-    *key_ptr = result;
-    return 0;
-}
-
-int PREFIXED(setspecific) (tsd * key, void * value) {
-    pthread_t self = pthread_self();
-    int hash_val = HASH(self);
-    volatile tse * entry = (volatile tse *)MALLOC_CLEAR(sizeof (tse));
-    
-    GC_ASSERT(self != INVALID_THREADID);
-    if (0 == entry) return ENOMEM;
-    pthread_mutex_lock(&(key -> lock));
-    /* Could easily check for an existing entry here.	*/
-    entry -> next = key -> hash[hash_val];
-    entry -> thread = self;
-    entry -> value = value;
-    GC_ASSERT(entry -> qtid == INVALID_QTID);
-    /* There can only be one writer at a time, but this needs to be	*/
-    /* atomic with respect to concurrent readers.			*/ 
-    *(volatile tse **)(key -> hash + hash_val) = entry;
-    pthread_mutex_unlock(&(key -> lock));
-    return 0;
-}
-
-/* Remove thread-specific data for this thread.  Should be called on	*/
-/* thread exit.								*/
-void PREFIXED(remove_specific) (tsd * key) {
-    pthread_t self = pthread_self();
-    unsigned hash_val = HASH(self);
-    tse *entry;
-    tse **link = key -> hash + hash_val;
-
-    pthread_mutex_lock(&(key -> lock));
-    entry = *link;
-    while (entry != NULL && entry -> thread != self) {
-	link = &(entry -> next);
-        entry = *link;
-    }
-    /* Invalidate qtid field, since qtids may be reused, and a later 	*/
-    /* cache lookup could otherwise find this entry.			*/
-        entry -> qtid = INVALID_QTID;
-    if (entry != NULL) {
-	*link = entry -> next;
-	/* Atomic! concurrent accesses still work.	*/
-	/* They must, since readers don't lock.		*/
-	/* We shouldn't need a volatile access here,	*/
-	/* since both this and the preceding write 	*/
-	/* should become visible no later than		*/
-	/* the pthread_mutex_unlock() call.		*/
-    }
-    /* If we wanted to deallocate the entry, we'd first have to clear 	*/
-    /* any cache entries pointing to it.  That probably requires	*/
-    /* additional synchronization, since we can't prevent a concurrent 	*/
-    /* cache lookup, which should still be examining deallocated memory.*/
-    /* This can only happen if the concurrent access is from another	*/
-    /* thread, and hence has missed the cache, but still...		*/
-
-    /* With GC, we're done, since the pointers from the cache will 	*/
-    /* be overwritten, all local pointers to the entries will be	*/
-    /* dropped, and the entry will then be reclaimed.			*/
-    pthread_mutex_unlock(&(key -> lock));
-}
-
-/* Note that even the slow path doesn't lock.	*/
-void *  PREFIXED(slow_getspecific) (tsd * key, unsigned long qtid,
-				    tse * volatile * cache_ptr) {
-    pthread_t self = pthread_self();
-    unsigned hash_val = HASH(self);
-    tse *entry = key -> hash[hash_val];
-
-    GC_ASSERT(qtid != INVALID_QTID);
-    while (entry != NULL && entry -> thread != self) {
-	entry = entry -> next;
-    } 
-    if (entry == NULL) return NULL;
-    /* Set cache_entry.		*/
-        entry -> qtid = qtid;
-		/* It's safe to do this asynchronously.  Either value 	*/
-		/* is safe, though may produce spurious misses.		*/
-		/* We're replacing one qtid with another one for the	*/
-		/* same thread.						*/
-	*cache_ptr = entry;
-		/* Again this is safe since pointer assignments are 	*/
-		/* presumed atomic, and either pointer is valid.	*/
-    return entry -> value;
-}
-
-#endif /* GC_LINUX_THREADS */
diff --git a/boehm-gc/stubborn.c b/boehm-gc/stubborn.c
deleted file mode 100644
index bb137616fa8..00000000000
--- a/boehm-gc/stubborn.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* Boehm, July 31, 1995 5:02 pm PDT */
-
-
-#include "private/gc_priv.h"
-
-# ifdef STUBBORN_ALLOC
-/* Stubborn object (hard to change, nearly immutable) allocation. */
-
-extern ptr_t GC_clear_stack();	/* in misc.c, behaves like identity */
-
-#define GENERAL_MALLOC(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc((word)lb, k))
-
-/* Data structure representing immutable objects that 	*/
-/* are still being initialized.				*/
-/* This is a bit baroque in order to avoid acquiring	*/
-/* the lock twice for a typical allocation.		*/
-
-GC_PTR * GC_changing_list_start;
-
-void GC_push_stubborn_structures GC_PROTO((void))
-{
-    GC_push_all((ptr_t)(&GC_changing_list_start),
-		(ptr_t)(&GC_changing_list_start) + sizeof(GC_PTR *));
-}
-
-# ifdef THREADS
-  VOLATILE GC_PTR * VOLATILE GC_changing_list_current;
-# else
-  GC_PTR * GC_changing_list_current;
-# endif
-	/* Points at last added element.  Also (ab)used for		*/
-	/* synchronization.  Updates and reads are assumed atomic.	*/
-
-GC_PTR * GC_changing_list_limit;
-	/* Points at the last word of the buffer, which is always 0	*/
-	/* All entries in (GC_changing_list_current,			*/
-	/* GC_changing_list_limit] are 0				*/
-
-
-void GC_stubborn_init()
-{
-#   define INIT_SIZE 10
-
-    GC_changing_list_start = (GC_PTR *)
-    			GC_INTERNAL_MALLOC(
-    				(word)(INIT_SIZE * sizeof(GC_PTR)),
-    				PTRFREE);
-    BZERO(GC_changing_list_start,
-    	  INIT_SIZE * sizeof(GC_PTR));
-    if (GC_changing_list_start == 0) {
-        GC_err_printf0("Insufficient space to start up\n");
-        ABORT("GC_stubborn_init: put of space");
-    }
-    GC_changing_list_current = GC_changing_list_start;
-    GC_changing_list_limit = GC_changing_list_start + INIT_SIZE - 1;
-    * GC_changing_list_limit = 0;
-}
-
-/* Compact and possibly grow GC_uninit_list.  The old copy is		*/
-/* left alone.	Lock must be held.					*/
-/* When called GC_changing_list_current == GC_changing_list_limit	*/
-/* which is one past the current element.				*/
-/* When we finish GC_changing_list_current again points one past last	*/
-/* element.								*/
-/* Invariant while this is running: GC_changing_list_current    	*/
-/* points at a word containing 0.					*/
-/* Returns FALSE on failure.						*/
-GC_bool GC_compact_changing_list()
-{
-    register GC_PTR *p, *q;
-    register word count = 0;
-    word old_size = (char **)GC_changing_list_limit
-    		    - (char **)GC_changing_list_start+1;
-    		    /* The casts are needed as a workaround for an Amiga bug */
-    register word new_size = old_size;
-    GC_PTR * new_list;
-    
-    for (p = GC_changing_list_start; p < GC_changing_list_limit; p++) {
-        if (*p != 0) count++;
-    }
-    if (2 * count > old_size) new_size = 2 * count;
-    new_list = (GC_PTR *)
-    		GC_INTERNAL_MALLOC(
-    				new_size * sizeof(GC_PTR), PTRFREE);
-    		/* PTRFREE is a lie.  But we don't want the collector to  */
-    		/* consider these.  We do want the list itself to be  	  */
-    		/* collectable.						  */
-    if (new_list == 0) return(FALSE);
-    BZERO(new_list, new_size * sizeof(GC_PTR));
-    q = new_list;
-    for (p = GC_changing_list_start; p < GC_changing_list_limit; p++) {
-        if (*p != 0) *q++ = *p;
-    }
-    GC_changing_list_start = new_list;
-    GC_changing_list_limit = new_list + new_size - 1;
-    GC_changing_list_current = q;
-    return(TRUE);
-}
-
-/* Add p to changing list.  Clear p on failure.	*/
-# define ADD_CHANGING(p) \
-	{	\
-	    register struct hblk * h = HBLKPTR(p);	\
-	    register word index = PHT_HASH(h);	\
-	    \
-	    set_pht_entry_from_index(GC_changed_pages, index);	\
-	}	\
-	if (*GC_changing_list_current != 0 \
-	    && ++GC_changing_list_current == GC_changing_list_limit) { \
-	    if (!GC_compact_changing_list()) (p) = 0; \
-	} \
-	*GC_changing_list_current = p;
-
-void GC_change_stubborn(p)
-GC_PTR p;
-{
-    DCL_LOCK_STATE;
-    
-    DISABLE_SIGNALS();
-    LOCK();
-    ADD_CHANGING(p);
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-void GC_end_stubborn_change(p)
-GC_PTR p;
-{
-#   ifdef THREADS
-      register VOLATILE GC_PTR * my_current = GC_changing_list_current;
-#   else
-      register GC_PTR * my_current = GC_changing_list_current;
-#   endif
-    register GC_bool tried_quick;
-    DCL_LOCK_STATE;
-    
-    if (*my_current == p) {
-        /* Hopefully the normal case.					*/
-        /* Compaction could not have been running when we started.	*/
-        *my_current = 0;
-#	ifdef THREADS
-          if (my_current == GC_changing_list_current) {
-            /* Compaction can't have run in the interim. 	*/
-            /* We got away with the quick and dirty approach.   */
-            return;
-          }
-          tried_quick = TRUE;
-#	else
-	  return;
-#	endif
-    } else {
-        tried_quick = FALSE;
-    }
-    DISABLE_SIGNALS();
-    LOCK();
-    my_current = GC_changing_list_current;
-    for (; my_current >= GC_changing_list_start; my_current--) {
-        if (*my_current == p) {
-            *my_current = 0;
-            UNLOCK();
-            ENABLE_SIGNALS();
-            return;
-        }
-    }
-    if (!tried_quick) {
-        GC_err_printf1("Bad arg to GC_end_stubborn_change: 0x%lx\n",
-        	       (unsigned long)p);
-        ABORT("Bad arg to GC_end_stubborn_change");
-    }
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-/* Allocate lb bytes of composite (pointerful) data	*/
-/* No pointer fields may be changed after a call to	*/
-/* GC_end_stubborn_change(p) where p is the value	*/
-/* returned by GC_malloc_stubborn.			*/
-# ifdef __STDC__
-    GC_PTR GC_malloc_stubborn(size_t lb)
-# else
-    GC_PTR GC_malloc_stubborn(lb)
-    size_t lb;
-# endif
-{
-register ptr_t op;
-register ptr_t *opp;
-register word lw;
-ptr_t result;
-DCL_LOCK_STATE;
-
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_sobjfreelist[lw]);
-	FASTLOCK();
-        if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {
-            FASTUNLOCK();
-            result = GC_generic_malloc((word)lb, STUBBORN);
-            goto record;
-        }
-        *opp = obj_link(op);
-        obj_link(op) = 0;
-        GC_words_allocd += lw;
-        result = (GC_PTR) op;
-        ADD_CHANGING(result);
-        FASTUNLOCK();
-        return((GC_PTR)result);
-   } else {
-       result = (GC_PTR)
-          	GC_generic_malloc((word)lb, STUBBORN);
-   }
-record:
-   DISABLE_SIGNALS();
-   LOCK();
-   ADD_CHANGING(result);
-   UNLOCK();
-   ENABLE_SIGNALS();
-   return((GC_PTR)GC_clear_stack(result));
-}
-
-
-/* Functions analogous to GC_read_dirty and GC_page_was_dirty.	*/
-/* Report pages on which stubborn objects were changed.		*/
-void GC_read_changed()
-{
-    register GC_PTR * p = GC_changing_list_start;
-    register GC_PTR q;
-    register struct hblk * h;
-    register word index;
-    
-    if (p == 0) /* initializing */ return;
-    BCOPY(GC_changed_pages, GC_prev_changed_pages,
-          (sizeof GC_changed_pages));
-    BZERO(GC_changed_pages, (sizeof GC_changed_pages));
-    for (; p <= GC_changing_list_current; p++) {
-        if ((q = *p) != 0) {
-            h = HBLKPTR(q);
-            index = PHT_HASH(h);
-            set_pht_entry_from_index(GC_changed_pages, index);
-        }
-    }
-}
-
-GC_bool GC_page_was_changed(h)
-struct hblk * h;
-{
-    register word index = PHT_HASH(h);
-    
-    return(get_pht_entry_from_index(GC_prev_changed_pages, index));
-}
-
-/* Remove unreachable entries from changed list. Should only be	*/
-/* called with mark bits consistent and lock held.		*/
-void GC_clean_changing_list()
-{
-    register GC_PTR * p = GC_changing_list_start;
-    register GC_PTR q;
-    register ptr_t r;
-    register unsigned long count = 0;
-    register unsigned long dropped_count = 0;
-    
-    if (p == 0) /* initializing */ return;
-    for (; p <= GC_changing_list_current; p++) {
-        if ((q = *p) != 0) {
-            count++;
-            r = (ptr_t)GC_base(q);
-            if (r == 0 || !GC_is_marked(r)) {
-                *p = 0;
-                dropped_count++;
-	    }
-        }
-    }
-#   ifdef PRINTSTATS
-      if (count > 0) {
-        GC_printf2("%lu entries in changing list: reclaimed %lu\n",
-                  (unsigned long)count, (unsigned long)dropped_count);
-      }
-#   endif
-}
-
-#else /* !STUBBORN_ALLOC */
-
-# ifdef __STDC__
-    GC_PTR GC_malloc_stubborn(size_t lb)
-# else
-    GC_PTR GC_malloc_stubborn(lb)
-    size_t lb;
-# endif
-{
-    return(GC_malloc(lb));
-}
-
-/*ARGSUSED*/
-void GC_end_stubborn_change(p)
-GC_PTR p;
-{
-}
-
-/*ARGSUSED*/
-void GC_change_stubborn(p)
-GC_PTR p;
-{
-}
-
-void GC_push_stubborn_structures GC_PROTO((void))
-{
-}
-
-#endif
diff --git a/boehm-gc/testsuite/Makefile.am b/boehm-gc/testsuite/Makefile.am
deleted file mode 100644
index f1eac3b1666..00000000000
--- a/boehm-gc/testsuite/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-
-AUTOMAKE_OPTIONS = foreign dejagnu no-dist
-
-EXPECT = expect
-
-# Override default.
-DEJATOOL = boehm-gc
-
-CLEANFILES = *.exe core* *.log *.sum
-
-# We need more things in site.exp, but automake completely controls the
-# creation of that file; there's no way to append to it without messing up
-# the dependancy chains.  So we overrule automake.  This rule is exactly
-# what it would have generated, plus our own additions.
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	@echo '## these variables are automatically generated by make ##' >site.tmp
-	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
-	@echo '# edit the last section' >>site.tmp
-	@echo 'set srcdir $(srcdir)' >>site.tmp
-	@echo "set objdir `pwd`" >>site.tmp
-	@echo 'set build_alias "$(build_alias)"' >>site.tmp
-	@echo 'set build_triplet $(build_triplet)' >>site.tmp
-	@echo 'set host_alias "$(host_alias)"' >>site.tmp
-	@echo 'set host_triplet $(host_triplet)' >>site.tmp
-	@echo 'set target_alias "$(target_alias)"' >>site.tmp
-	@echo 'set target_triplet $(target_triplet)' >>site.tmp
-	@echo 'set threadcflags "$(THREADCFLAGS)"' >>site.tmp
-	@echo 'set threadlibs "$(THREADLIBS)"' >>site.tmp
-	@echo 'set extra_test_libs "$(EXTRA_TEST_LIBS)"' >>site.tmp
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp
-	@test ! -f site.exp || \
-	  sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
-	@-rm -f site.bak
-	@test ! -f site.exp || mv site.exp site.bak
-	@mv site.tmp site.exp
diff --git a/boehm-gc/testsuite/Makefile.in b/boehm-gc/testsuite/Makefile.in
deleted file mode 100644
index 5133b1fb058..00000000000
--- a/boehm-gc/testsuite/Makefile.in
+++ /dev/null
@@ -1,436 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = testsuite
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
-	$(top_srcdir)/../config/depstand.m4 \
-	$(top_srcdir)/../config/lead-dot.m4 \
-	$(top_srcdir)/../config/multi.m4 \
-	$(top_srcdir)/../config/no-executables.m4 \
-	$(top_srcdir)/../config/override.m4 \
-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
-	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
-	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-CONFIG_HEADER = $(top_builddir)/include/gc_config.h \
-	$(top_builddir)/include/gc_ext_config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-RUNTEST = runtest
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
-FGREP = @FGREP@
-GC_CFLAGS = @GC_CFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-O0_CFLAGS = @O0_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-THREADCFLAGS = @THREADCFLAGS@
-THREADLIBS = @THREADLIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-addincludes = @addincludes@
-addlibs = @addlibs@
-addobjs = @addobjs@
-addtests = @addtests@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-extra_ldflags_libgc = @extra_ldflags_libgc@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-mkinstalldirs = @mkinstalldirs@
-multi_basedir = @multi_basedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_all = @target_all@
-target_cpu = @target_cpu@
-target_noncanonical = @target_noncanonical@
-target_os = @target_os@
-target_vendor = @target_vendor@
-toolexecdir = @toolexecdir@
-toolexeclibdir = @toolexeclibdir@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign dejagnu no-dist
-EXPECT = expect
-
-# Override default.
-DEJATOOL = boehm-gc
-CLEANFILES = *.exe core* *.log *.sum
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign testsuite/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-DEJAGNU: site.exp
-	srcdir='$(srcdir)'; export srcdir; \
-	EXPECT=$(EXPECT); export EXPECT; \
-	runtest=$(RUNTEST); \
-	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
-	  exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
-	    if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
-	    then :; else exit_status=1; fi; \
-	  done; \
-	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
-	fi; \
-	exit $$exit_status
-
-distclean-DEJAGNU:
-	-rm -f site.exp site.bak
-	-l='$(DEJATOOL)'; for tool in $$l; do \
-	  rm -f $$tool.sum $$tool.log; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-DEJAGNU distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
-	clean-libtool distclean distclean-DEJAGNU distclean-generic \
-	distclean-libtool dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
-
-
-# We need more things in site.exp, but automake completely controls the
-# creation of that file; there's no way to append to it without messing up
-# the dependancy chains.  So we overrule automake.  This rule is exactly
-# what it would have generated, plus our own additions.
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	@echo '## these variables are automatically generated by make ##' >site.tmp
-	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
-	@echo '# edit the last section' >>site.tmp
-	@echo 'set srcdir $(srcdir)' >>site.tmp
-	@echo "set objdir `pwd`" >>site.tmp
-	@echo 'set build_alias "$(build_alias)"' >>site.tmp
-	@echo 'set build_triplet $(build_triplet)' >>site.tmp
-	@echo 'set host_alias "$(host_alias)"' >>site.tmp
-	@echo 'set host_triplet $(host_triplet)' >>site.tmp
-	@echo 'set target_alias "$(target_alias)"' >>site.tmp
-	@echo 'set target_triplet $(target_triplet)' >>site.tmp
-	@echo 'set threadcflags "$(THREADCFLAGS)"' >>site.tmp
-	@echo 'set threadlibs "$(THREADLIBS)"' >>site.tmp
-	@echo 'set extra_test_libs "$(EXTRA_TEST_LIBS)"' >>site.tmp
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp
-	@test ! -f site.exp || \
-	  sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
-	@-rm -f site.bak
-	@test ! -f site.exp || mv site.exp site.bak
-	@mv site.tmp site.exp
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/boehm-gc/testsuite/boehm-gc.c++/test_cpp.cc b/boehm-gc/testsuite/boehm-gc.c++/test_cpp.cc
deleted file mode 100644
index 6661e411927..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c++/test_cpp.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-/****************************************************************************
-Copyright (c) 1994 by Xerox Corporation.  All rights reserved.
- 
-THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- 
-Permission is hereby granted to use or copy this program for any
-purpose, provided the above notices are retained on all copies.
-Permission to modify the code and to distribute modified code is
-granted, provided the above notices are retained, and a notice that
-the code was modified is included with the above copyright notice.
-****************************************************************************
-Last modified on Mon Jul 10 21:06:03 PDT 1995 by ellis
-     modified on December 20, 1994 7:27 pm PST by boehm
-
-usage: test_cpp number-of-iterations
-
-This program tries to test the specific C++ functionality provided by
-gc_c++.h that isn't tested by the more general test routines of the
-collector.
-
-A recommended value for number-of-iterations is 10, which will take a
-few minutes to complete.
-
-***************************************************************************/
-
-#include "gc_cpp.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define USE_STD_ALLOCATOR
-#ifdef USE_STD_ALLOCATOR
-#   include "gc_allocator.h"
-#elif __GNUC__
-#   include "new_gc_alloc.h"
-#else
-#   include "gc_alloc.h"
-#endif
-extern "C" {
-#include "private/gc_priv.h"
-}
-#ifdef MSWIN32
-#   include <windows.h>
-#endif
-#ifdef GC_NAME_CONFLICT
-#   define USE_GC UseGC
-    struct foo * GC;
-#else
-#   define USE_GC GC
-#endif
-
-
-#define my_assert( e ) \
-    if (! (e)) { \
-        GC_printf1( "Assertion failure in " __FILE__ ", line %d: " #e "\n", \
-                    __LINE__ ); \
-        exit( 1 ); }
-
-
-class A {public:
-    /* An uncollectable class. */
-
-    A( int iArg ): i( iArg ) {}
-    void Test( int iArg ) {
-        my_assert( i == iArg );} 
-    int i;};
-
-
-class B: public gc, public A {public:
-    /* A collectable class. */
-
-    B( int j ): A( j ) {}
-    ~B() {
-        my_assert( deleting );}
-    static void Deleting( int on ) {
-        deleting = on;}
-    static int deleting;};
-
-int B::deleting = 0;
-
-
-class C: public gc_cleanup, public A {public:
-    /* A collectable class with cleanup and virtual multiple inheritance. */
-
-    C( int levelArg ): A( levelArg ), level( levelArg ) {
-        nAllocated++;
-        if (level > 0) {
-            left = new C( level - 1 );
-            right = new C( level - 1 );}
-        else {
-            left = right = 0;}}
-    ~C() {
-        this->A::Test( level );
-        nFreed++;
-        my_assert( level == 0 ? 
-                   left == 0 && right == 0 :
-                   level == left->level + 1 && level == right->level + 1 );
-        left = right = 0;
-        level = -123456;}
-    static void Test() {
-        my_assert( nFreed <= nAllocated && nFreed >= .8 * nAllocated );}
-
-    static int nFreed;
-    static int nAllocated;
-    int level;
-    C* left;
-    C* right;};
-
-int C::nFreed = 0;
-int C::nAllocated = 0;
-
-
-class D: public gc {public:
-    /* A collectable class with a static member function to be used as
-    an explicit clean-up function supplied to ::new. */
-
-    D( int iArg ): i( iArg ) {
-        nAllocated++;}
-    static void CleanUp( void* obj, void* data ) {
-        D* self = (D*) obj;
-        nFreed++;
-        my_assert( self->i == (int) (long) data );}
-    static void Test() {
-        my_assert( nFreed >= .8 * nAllocated );}
-       
-    int i;
-    static int nFreed;
-    static int nAllocated;};
-
-int D::nFreed = 0;
-int D::nAllocated = 0;
-
-
-class E: public gc_cleanup {public:
-    /* A collectable class with clean-up for use by F. */
-
-    E() {
-        nAllocated++;}
-    ~E() {
-        nFreed++;}
-
-    static int nFreed;
-    static int nAllocated;};
-    
-int E::nFreed = 0;
-int E::nAllocated = 0;
-   
-
-class F: public E {public:
-    /* A collectable class with clean-up, a base with clean-up, and a
-    member with clean-up. */
-
-    F() {
-        nAllocated++;}
-    ~F() {
-        nFreed++;}
-    static void Test() {
-        my_assert( nFreed >= .8 * nAllocated );
-        my_assert( 2 * nFreed == E::nFreed );}
-       
-    E e;
-    static int nFreed;
-    static int nAllocated;};
-    
-int F::nFreed = 0;
-int F::nAllocated = 0;
-   
-
-long Disguise( void* p ) {
-    return ~ (long) p;}
-
-void* Undisguise( long i ) {
-    return (void*) ~ i;}
-
-
-#ifdef MSWIN32
-int APIENTRY WinMain(
-    HINSTANCE instance, HINSTANCE prev, LPSTR cmd, int cmdShow ) 
-{
-    int argc;
-    char* argv[ 3 ];
-
-    for (argc = 1; argc < sizeof( argv ) / sizeof( argv[ 0 ] ); argc++) {
-        argv[ argc ] = strtok( argc == 1 ? cmd : 0, " \t" );
-        if (0 == argv[ argc ]) break;}
-
-#else
-# ifdef MACOS
-    int main() {
-# else
-    int main( int argc, char* argv[] ) {
-# endif
-#endif
-
-   GC_INIT();
-
-#  if defined(MACOS)                        // MacOS
-    char* argv_[] = {"test_cpp", "10"};     //   doesn't
-    argv = argv_;                           //     have a
-    argc = sizeof(argv_)/sizeof(argv_[0]);  //       commandline
-#  endif 
-    int i, iters, n;
-#   ifdef USE_STD_ALLOCATOR
-      int *x = gc_allocator<int>().allocate(1);
-      int **xptr = traceable_allocator<int *>().allocate(1);
-#   else 
-#     ifdef __GNUC__
-          int *x = (int *)gc_alloc::allocate(sizeof(int));
-#     else
-          int *x = (int *)alloc::allocate(sizeof(int));
-#     endif
-#   endif
-    *x = 29;
-#   ifdef USE_STD_ALLOCATOR
-      *xptr = x;
-      x = 0;
-#   endif
-    if (argc != 2 || (0 >= (n = atoi( argv[ 1 ] )))) {
-        GC_printf0( "usage: test_cpp number-of-iterations\nAssuming 10 iters\n" );
-        n = 10;}
-        
-    for (iters = 1; iters <= n; iters++) {
-        GC_printf1( "Starting iteration %d\n", iters );
-
-            /* Allocate some uncollectable As and disguise their pointers.
-            Later we'll check to see if the objects are still there.  We're
-            checking to make sure these objects really are uncollectable. */
-        long as[ 1000 ];
-        long bs[ 1000 ];
-        for (i = 0; i < 1000; i++) {
-            as[ i ] = Disguise( new (NoGC) A( i ) );
-            bs[ i ] = Disguise( new (NoGC) B( i ) );}
-
-            /* Allocate a fair number of finalizable Cs, Ds, and Fs.
-            Later we'll check to make sure they've gone away. */
-        for (i = 0; i < 1000; i++) {
-            C* c = new C( 2 );
-            C c1( 2 );           /* stack allocation should work too */
-            D* d = ::new (USE_GC, D::CleanUp, (void*)(long)i) D( i );
-            F* f = new F;
-            if (0 == i % 10) delete c;}
-
-            /* Allocate a very large number of collectable As and Bs and
-            drop the references to them immediately, forcing many
-            collections. */
-        for (i = 0; i < 1000000; i++) {
-            A* a = new (USE_GC) A( i );
-            B* b = new B( i );
-            b = new (USE_GC) B( i );
-            if (0 == i % 10) {
-                B::Deleting( 1 );
-                delete b;
-                B::Deleting( 0 );}
-#	    ifdef FINALIZE_ON_DEMAND
-	      GC_invoke_finalizers();
-#	    endif
-	    }
-
-            /* Make sure the uncollectable As and Bs are still there. */
-        for (i = 0; i < 1000; i++) {
-            A* a = (A*) Undisguise( as[ i ] );
-            B* b = (B*) Undisguise( bs[ i ] );
-            a->Test( i );
-            delete a;
-            b->Test( i );
-            B::Deleting( 1 );
-            delete b;
-            B::Deleting( 0 );
-#	    ifdef FINALIZE_ON_DEMAND
-	   	 GC_invoke_finalizers();
-#	    endif
-
-	    }
-
-            /* Make sure most of the finalizable Cs, Ds, and Fs have
-            gone away. */
-        C::Test();
-        D::Test();
-        F::Test();}
-
-#   ifdef USE_STD_ALLOCATOR
-      x = *xptr;
-#   endif
-    my_assert (29 == x[0]);
-    GC_printf0( "The test appears to have succeeded.\n" );
-    return( 0 );}
-    
-
diff --git a/boehm-gc/testsuite/boehm-gc.c/c.exp b/boehm-gc/testsuite/boehm-gc.c/c.exp
deleted file mode 100644
index fea46600348..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/c.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-dg-init
-boehm-gc-init
-
-boehm-gc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "-O2" ""
-
-dg-finish
diff --git a/boehm-gc/testsuite/boehm-gc.c/gctest.c b/boehm-gc/testsuite/boehm-gc.c/gctest.c
deleted file mode 100644
index cc03e96e554..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/gctest.c
+++ /dev/null
@@ -1,1858 +0,0 @@
-/* 
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * Copyright (c) 1996 by Silicon Graphics.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-/* An incomplete test for the garbage collector.  		*/
-/* Some more obscure entry points are not tested at all.	*/
-/* This must be compiled with the same flags used to build the 	*/
-/* GC.  It uses GC internals to allow more precise results	*/
-/* checking for some of the tests.				*/
-
-# undef GC_BUILD
-
-#if defined(DBG_HDRS_ALL) || defined(MAKE_BACK_GRAPH)
-#  define GC_DEBUG
-#endif
-
-# if defined(mips) && defined(SYSTYPE_BSD43)
-    /* MIPS RISCOS 4 */
-# else
-#   include <stdlib.h>
-# endif
-# include <stdio.h>
-# ifdef _WIN32_WCE
-#   include <winbase.h>
-#   define assert ASSERT
-# else
-#   include <assert.h>        /* Not normally used, but handy for debugging. */
-# endif
-# include <assert.h>	/* Not normally used, but handy for debugging. */
-# include "gc.h"
-# include "gc_typed.h"
-# ifdef THREAD_LOCAL_ALLOC
-#   include "gc_local_alloc.h"
-# endif
-# include "private/gc_priv.h"	/* For output, locking, MIN_WORDS, 	*/
-				/* and some statistics.			*/
-# include "private/gcconfig.h"
-
-# if defined(MSWIN32) || defined(MSWINCE)
-#   include <windows.h>
-# endif
-
-# ifdef PCR
-#   include "th/PCR_ThCrSec.h"
-#   include "th/PCR_Th.h"
-#   undef GC_printf0
-#   define GC_printf0 printf
-#   undef GC_printf1
-#   define GC_printf1 printf
-# endif
-
-# if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-#   include <thread.h>
-#   include <synch.h>
-# endif
-
-# if defined(GC_PTHREADS)
-#   include <pthread.h>
-# endif
-
-# if defined(GC_WIN32_THREADS) && !defined(GC_PTHREADS)
-    static CRITICAL_SECTION incr_cs;
-# endif
-
-#ifdef __STDC__
-# include <stdarg.h>
-#endif
-
-
-/* Allocation Statistics */
-int stubborn_count = 0;
-int uncollectable_count = 0;
-int collectable_count = 0;
-int atomic_count = 0;
-int realloc_count = 0;
-
-#if defined(GC_AMIGA_FASTALLOC) && defined(AMIGA)
-
-  extern void GC_amiga_free_all_mem(void);
-  void Amiga_Fail(void){GC_amiga_free_all_mem();abort();}
-# define FAIL (void)Amiga_Fail()
-  void *GC_amiga_gctest_malloc_explicitly_typed(size_t lb, GC_descr d){
-    void *ret=GC_malloc_explicitly_typed(lb,d);
-    if(ret==NULL){
-		if(!GC_dont_gc){
-	      GC_gcollect();
-	      ret=GC_malloc_explicitly_typed(lb,d);
-		}
-      if(ret==NULL){
-        GC_printf0("Out of memory, (typed allocations are not directly "
-		   "supported with the GC_AMIGA_FASTALLOC option.)\n");
-        FAIL;
-      }
-    }
-    return ret;
-  }
-  void *GC_amiga_gctest_calloc_explicitly_typed(size_t a,size_t lb, GC_descr d){
-    void *ret=GC_calloc_explicitly_typed(a,lb,d);
-    if(ret==NULL){
-		if(!GC_dont_gc){
-	      GC_gcollect();
-	      ret=GC_calloc_explicitly_typed(a,lb,d);
-		}
-      if(ret==NULL){
-        GC_printf0("Out of memory, (typed allocations are not directly "
-		   "supported with the GC_AMIGA_FASTALLOC option.)\n");
-        FAIL;
-      }
-    }
-    return ret;
-  }
-# define GC_malloc_explicitly_typed(a,b) GC_amiga_gctest_malloc_explicitly_typed(a,b) 
-# define GC_calloc_explicitly_typed(a,b,c) GC_amiga_gctest_calloc_explicitly_typed(a,b,c) 
-
-#else /* !AMIGA_FASTALLOC */
-
-# ifdef PCR
-#   define FAIL (void)abort()
-# else
-#   ifdef MSWINCE
-#     define FAIL DebugBreak()
-#   else
-#     define FAIL GC_abort("Test failed");
-#   endif
-# endif
-
-#endif /* !AMIGA_FASTALLOC */
-
-/* AT_END may be defined to exercise the interior pointer test	*/
-/* if the collector is configured with ALL_INTERIOR_POINTERS.   */
-/* As it stands, this test should succeed with either		*/
-/* configuration.  In the FIND_LEAK configuration, it should	*/
-/* find lots of leaks, since we free almost nothing.		*/
-
-struct SEXPR {
-    struct SEXPR * sexpr_car;
-    struct SEXPR * sexpr_cdr;
-};
-
-
-typedef struct SEXPR * sexpr;
-
-# define INT_TO_SEXPR(x) ((sexpr)(unsigned long)(x))
-
-# undef nil
-# define nil (INT_TO_SEXPR(0))
-# define car(x) ((x) -> sexpr_car)
-# define cdr(x) ((x) -> sexpr_cdr)
-# define is_nil(x) ((x) == nil)
-
-
-int extra_count = 0;        /* Amount of space wasted in cons node */
-
-/* Silly implementation of Lisp cons. Intentionally wastes lots of space */
-/* to test collector.                                                    */
-# ifdef VERY_SMALL_CONFIG
-#   define cons small_cons
-# else
-sexpr cons (x, y)
-sexpr x;
-sexpr y;
-{
-    register sexpr r;
-    register int *p;
-    register int my_extra = extra_count;
-    
-    stubborn_count++;
-    r = (sexpr) GC_MALLOC_STUBBORN(sizeof(struct SEXPR) + my_extra);
-    if (r == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    for (p = (int *)r;
-         ((char *)p) < ((char *)r) + my_extra + sizeof(struct SEXPR); p++) {
-	if (*p) {
-	    (void)GC_printf1("Found nonzero at 0x%lx - allocator is broken\n",
-	    		     (unsigned long)p);
-	    FAIL;
-        }
-        *p = 13;
-    }
-#   ifdef AT_END
-	r = (sexpr)((char *)r + (my_extra & ~7));
-#   endif
-    r -> sexpr_car = x;
-    r -> sexpr_cdr = y;
-    my_extra++;
-    if ( my_extra >= 5000 ) {
-        extra_count = 0;
-    } else {
-        extra_count = my_extra;
-    }
-    GC_END_STUBBORN_CHANGE((char *)r);
-    return(r);
-}
-# endif
-
-#ifdef GC_GCJ_SUPPORT
-
-#include "gc_mark.h"
-#include "gc_gcj.h"
-
-/* The following struct emulates the vtable in gcj.	*/
-/* This assumes the default value of MARK_DESCR_OFFSET. */
-struct fake_vtable {
-  void * dummy;		/* class pointer in real gcj.	*/
-  size_t descr;
-};
-
-struct fake_vtable gcj_class_struct1 = { 0, sizeof(struct SEXPR)
-					    + sizeof(struct fake_vtable *) };
-			/* length based descriptor.	*/
-struct fake_vtable gcj_class_struct2 =
-				{ 0, (3l << (CPP_WORDSZ - 3)) | GC_DS_BITMAP};
-			/* Bitmap based descriptor.	*/
-
-struct GC_ms_entry * fake_gcj_mark_proc(word * addr,
-				        struct GC_ms_entry *mark_stack_ptr,
-				        struct GC_ms_entry *mark_stack_limit,
-				        word env   )
-{
-    sexpr x;
-    if (1 == env) {
-	/* Object allocated with debug allocator.	*/
-	addr = (word *)GC_USR_PTR_FROM_BASE(addr);
-    }
-    x = (sexpr)(addr + 1); /* Skip the vtable pointer. */
-    mark_stack_ptr = GC_MARK_AND_PUSH(
-			      (GC_PTR)(x -> sexpr_cdr), mark_stack_ptr,
-			      mark_stack_limit, (GC_PTR *)&(x -> sexpr_cdr));
-    mark_stack_ptr = GC_MARK_AND_PUSH(
-			      (GC_PTR)(x -> sexpr_car), mark_stack_ptr,
-			      mark_stack_limit, (GC_PTR *)&(x -> sexpr_car));
-    return(mark_stack_ptr);
-}
-
-#endif /* GC_GCJ_SUPPORT */
-
-#ifdef THREAD_LOCAL_ALLOC
-
-#undef GC_REDIRECT_TO_LOCAL
-#include "gc_local_alloc.h"
-
-sexpr local_cons (x, y)
-sexpr x;
-sexpr y;
-{
-    register sexpr r;
-    register int *p;
-    register int my_extra = extra_count;
-    static int my_random = 0;
-    
-    collectable_count++;
-    r = (sexpr) GC_LOCAL_MALLOC(sizeof(struct SEXPR) + my_extra);
-#   ifdef GC_GCJ_SUPPORT
-      if (collectable_count % 2 == 0) {
-        r = (sexpr) GC_LOCAL_GCJ_MALLOC(sizeof(struct SEXPR) + sizeof(GC_word) + my_extra,
-					&gcj_class_struct1);
-        r = (sexpr) ((GC_word *)r + 1);
-      }
-#   endif
-    if (r == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    for (p = (int *)r;
-         ((char *)p) < ((char *)r) + my_extra + sizeof(struct SEXPR); p++) {
-	if (*p) {
-	    (void)GC_printf1("Found nonzero at 0x%lx (local) - allocator is broken\n",
-	    		     (unsigned long)p);
-	    FAIL;
-        }
-        *p = 13;
-    }
-    r -> sexpr_car = x;
-    r -> sexpr_cdr = y;
-    my_extra++;
-    if ( my_extra >= 5000 || my_extra == 200 && ++my_random % 37 != 0) {
-        extra_count = 0;
-    } else {
-        extra_count = my_extra;
-    }
-    return(r);
-}
-#endif /* THREAD_LOCAL_ALLOC */
-
-sexpr small_cons (x, y)
-sexpr x;
-sexpr y;
-{
-    register sexpr r;
-    
-    collectable_count++;
-    r = (sexpr) GC_MALLOC(sizeof(struct SEXPR));
-    if (r == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    r -> sexpr_car = x;
-    r -> sexpr_cdr = y;
-    return(r);
-}
-
-sexpr small_cons_uncollectable (x, y)
-sexpr x;
-sexpr y;
-{
-    register sexpr r;
-    
-    uncollectable_count++;
-    r = (sexpr) GC_MALLOC_UNCOLLECTABLE(sizeof(struct SEXPR));
-    if (r == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    r -> sexpr_car = x;
-    r -> sexpr_cdr = (sexpr)(~(unsigned long)y);
-    return(r);
-}
-
-#ifdef GC_GCJ_SUPPORT
-
-
-sexpr gcj_cons(x, y)
-sexpr x;
-sexpr y;
-{
-    GC_word * r;
-    sexpr result;
-    static int count = 0;
-    
-    if (++count & 1) {
-#     ifdef USE_MARK_BYTES
-        r = (GC_word *) GC_GCJ_FAST_MALLOC(4, &gcj_class_struct1);
-#     else
-        r = (GC_word *) GC_GCJ_FAST_MALLOC(3, &gcj_class_struct1);
-#     endif
-    } else {
-        r = (GC_word *) GC_GCJ_MALLOC(sizeof(struct SEXPR)
-				      + sizeof(struct fake_vtable*),
-				      &gcj_class_struct2);
-    }
-    if (r == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    result = (sexpr)(r + 1);
-    result -> sexpr_car = x;
-    result -> sexpr_cdr = y;
-    return(result);
-}
-#endif
-
-/* Return reverse(x) concatenated with y */
-sexpr reverse1(x, y)
-sexpr x, y;
-{
-    if (is_nil(x)) {
-        return(y);
-    } else {
-        return( reverse1(cdr(x), cons(car(x), y)) );
-    }
-}
-
-sexpr reverse(x)
-sexpr x;
-{
-#   ifdef TEST_WITH_SYSTEM_MALLOC
-      malloc(100000);
-#   endif
-    return( reverse1(x, nil) );
-}
-
-sexpr ints(low, up)
-int low, up;
-{
-    if (low > up) {
-	return(nil);
-    } else {
-        return(small_cons(small_cons(INT_TO_SEXPR(low), nil), ints(low+1, up)));
-    }
-}
-
-#ifdef GC_GCJ_SUPPORT
-/* Return reverse(x) concatenated with y */
-sexpr gcj_reverse1(x, y)
-sexpr x, y;
-{
-    if (is_nil(x)) {
-        return(y);
-    } else {
-        return( gcj_reverse1(cdr(x), gcj_cons(car(x), y)) );
-    }
-}
-
-sexpr gcj_reverse(x)
-sexpr x;
-{
-    return( gcj_reverse1(x, nil) );
-}
-
-sexpr gcj_ints(low, up)
-int low, up;
-{
-    if (low > up) {
-	return(nil);
-    } else {
-        return(gcj_cons(gcj_cons(INT_TO_SEXPR(low), nil), gcj_ints(low+1, up)));
-    }
-}
-#endif /* GC_GCJ_SUPPORT */
-
-#ifdef THREAD_LOCAL_ALLOC
-/* Return reverse(x) concatenated with y */
-sexpr local_reverse1(x, y)
-sexpr x, y;
-{
-    if (is_nil(x)) {
-        return(y);
-    } else {
-        return( local_reverse1(cdr(x), local_cons(car(x), y)) );
-    }
-}
-
-sexpr local_reverse(x)
-sexpr x;
-{
-    return( local_reverse1(x, nil) );
-}
-
-sexpr local_ints(low, up)
-int low, up;
-{
-    if (low > up) {
-	return(nil);
-    } else {
-        return(local_cons(local_cons(INT_TO_SEXPR(low), nil), local_ints(low+1, up)));
-    }
-}
-#endif /* THREAD_LOCAL_ALLOC */
-
-/* To check uncollectable allocation we build lists with disguised cdr	*/
-/* pointers, and make sure they don't go away.				*/
-sexpr uncollectable_ints(low, up)
-int low, up;
-{
-    if (low > up) {
-	return(nil);
-    } else {
-        return(small_cons_uncollectable(small_cons(INT_TO_SEXPR(low), nil),
-               uncollectable_ints(low+1, up)));
-    }
-}
-
-void check_ints(list, low, up)
-sexpr list;
-int low, up;
-{
-    if ((int)(GC_word)(car(car(list))) != low) {
-        (void)GC_printf0(
-           "List reversal produced incorrect list - collector is broken\n");
-        FAIL;
-    }
-    if (low == up) {
-        if (cdr(list) != nil) {
-           (void)GC_printf0("List too long - collector is broken\n");
-           FAIL;
-        }
-    } else {
-        check_ints(cdr(list), low+1, up);
-    }
-}
-
-# define UNCOLLECTABLE_CDR(x) (sexpr)(~(unsigned long)(cdr(x)))
-
-void check_uncollectable_ints(list, low, up)
-sexpr list;
-int low, up;
-{
-    if ((int)(GC_word)(car(car(list))) != low) {
-        (void)GC_printf0(
-           "Uncollectable list corrupted - collector is broken\n");
-        FAIL;
-    }
-    if (low == up) {
-        if (UNCOLLECTABLE_CDR(list) != nil) {
-           (void)GC_printf0("Uncollectable list too long - collector is broken\n");
-           FAIL;
-        }
-    } else {
-        check_uncollectable_ints(UNCOLLECTABLE_CDR(list), low+1, up);
-    }
-}
-
-/* Not used, but useful for debugging: */
-void print_int_list(x)
-sexpr x;
-{
-    if (is_nil(x)) {
-        (void)GC_printf0("NIL\n");
-    } else {
-        (void)GC_printf1("(%ld)", (long)(car(car(x))));
-        if (!is_nil(cdr(x))) {
-            (void)GC_printf0(", ");
-            (void)print_int_list(cdr(x));
-        } else {
-            (void)GC_printf0("\n");
-        }
-    }
-}
-
-/*
- * A tiny list reversal test to check thread creation.
- */
-#ifdef THREADS
-
-# if defined(GC_WIN32_THREADS) && !defined(CYGWIN32)
-    DWORD  __stdcall tiny_reverse_test(void * arg)
-# else
-    void * tiny_reverse_test(void * arg)
-# endif
-{
-    int i;
-    for (i = 0; i < 5; ++i) {
-      check_ints(reverse(reverse(ints(1,10))), 1, 10);
-#     ifdef THREAD_LOCAL_ALLOC
-        check_ints(local_reverse(local_reverse(local_ints(1,10))), 1, 10);
-#     endif
-    }
-    return 0;
-}
-
-# if defined(GC_PTHREADS)
-    void fork_a_thread()
-    {
-      pthread_t t;
-      int code;
-      if ((code = pthread_create(&t, 0, tiny_reverse_test, 0)) != 0) {
-    	(void)GC_printf1("Small thread creation failed %lu\n",
-		         (unsigned long)code);
-    	FAIL;
-      }
-      if ((code = pthread_join(t, 0)) != 0) {
-        (void)GC_printf1("Small thread join failed %lu\n",
-	(unsigned long)code);
-        FAIL;
-      }
-    }
-
-# elif defined(GC_WIN32_THREADS)
-    void fork_a_thread()
-    {
-  	DWORD thread_id;
-	HANDLE h;
-    	h = GC_CreateThread(NULL, 0, tiny_reverse_test, 0, 0, &thread_id);
-        if (h == (HANDLE)NULL) {
-            (void)GC_printf1("Small thread creation failed %lu\n",
-			     (unsigned long)GetLastError());
-      	    FAIL;
-        }
-    	if (WaitForSingleObject(h, INFINITE) != WAIT_OBJECT_0) {
-      	    (void)GC_printf1("Small thread wait failed %lu\n",
-			     (unsigned long)GetLastError());
-      	    FAIL;
-    	}
-    }
-
-/* # elif defined(GC_SOLARIS_THREADS) */
-
-# else
-
-#   define fork_a_thread()
-
-# endif
-
-#else
-
-# define fork_a_thread()
-
-#endif 
-
-/* Try to force a to be strangely aligned */
-struct {
-  char dummy;
-  sexpr aa;
-} A;
-#define a A.aa
-
-/*
- * Repeatedly reverse lists built out of very different sized cons cells.
- * Check that we didn't lose anything.
- */
-void reverse_test()
-{
-    int i;
-    sexpr b;
-    sexpr c;
-    sexpr d;
-    sexpr e;
-    sexpr *f, *g, *h;
-#   if defined(MSWIN32) || defined(MACOS)
-      /* Win32S only allows 128K stacks */
-#     define BIG 1000
-#   else
-#     if defined PCR
-	/* PCR default stack is 100K.  Stack frames are up to 120 bytes. */
-#	define BIG 700
-#     else
-#	if defined MSWINCE
-	  /* WinCE only allows 64K stacks */
-#	  define BIG 500
-#	else
-#	  if defined(OSF1)
-	    /* OSF has limited stack space by default, and large frames. */
-#           define BIG 200
-#	  else
-#	    if defined(__MACH__) && defined(__ppc64__)
-	      /* Small stack and largish frames.  */
-#             define BIG 2500	      
-#	    else
-#             define BIG 4500
-#	    endif
-#	  endif
-#	endif
-#     endif
-#   endif
-
-    A.dummy = 17;
-    a = ints(1, 49);
-    b = ints(1, 50);
-    c = ints(1, BIG);
-    d = uncollectable_ints(1, 100);
-    e = uncollectable_ints(1, 1);
-    /* Check that realloc updates object descriptors correctly */
-    collectable_count++;
-    f = (sexpr *)GC_MALLOC(4 * sizeof(sexpr));
-    realloc_count++;
-    f = (sexpr *)GC_REALLOC((GC_PTR)f, 6 * sizeof(sexpr));
-    f[5] = ints(1,17);
-    collectable_count++;
-    g = (sexpr *)GC_MALLOC(513 * sizeof(sexpr));
-    realloc_count++;
-    g = (sexpr *)GC_REALLOC((GC_PTR)g, 800 * sizeof(sexpr));
-    g[799] = ints(1,18);
-    collectable_count++;
-    h = (sexpr *)GC_MALLOC(1025 * sizeof(sexpr));
-    realloc_count++;
-    h = (sexpr *)GC_REALLOC((GC_PTR)h, 2000 * sizeof(sexpr));
-#   ifdef GC_GCJ_SUPPORT
-      h[1999] = gcj_ints(1,200);
-      for (i = 0; i < 51; ++i) 
-        h[1999] = gcj_reverse(h[1999]);
-      /* Leave it as the reveresed list for now. */
-#   else
-      h[1999] = ints(1,200);
-#   endif
-    /* Try to force some collections and reuse of small list elements */
-      for (i = 0; i < 10; i++) {
-        (void)ints(1, BIG);
-      }
-    /* Superficially test interior pointer recognition on stack */
-      c = (sexpr)((char *)c + sizeof(char *));
-      d = (sexpr)((char *)d + sizeof(char *));
-
-#   ifdef __STDC__
-        GC_FREE((void *)e);
-#   else
-        GC_FREE((char *)e);
-#   endif
-    check_ints(b,1,50);
-    check_ints(a,1,49);
-    for (i = 0; i < 50; i++) {
-        check_ints(b,1,50);
-        b = reverse(reverse(b));
-    }
-    check_ints(b,1,50);
-    check_ints(a,1,49);
-    for (i = 0; i < 60; i++) {
-	if (i % 10 == 0) fork_a_thread();
-    	/* This maintains the invariant that a always points to a list of */
-    	/* 49 integers.  Thus this is thread safe without locks,	  */
-    	/* assuming atomic pointer assignments.				  */
-        a = reverse(reverse(a));
-#       ifdef THREAD_LOCAL_ALLOC
-	  a = local_reverse(local_reverse(a));
-#	endif
-#	if !defined(AT_END) && !defined(THREADS)
-	  /* This is not thread safe, since realloc explicitly deallocates */
-          if (i & 1) {
-            a = (sexpr)GC_REALLOC((GC_PTR)a, 500);
-          } else {
-            a = (sexpr)GC_REALLOC((GC_PTR)a, 8200);
-          }
-#	endif
-    }
-    check_ints(a,1,49);
-    check_ints(b,1,50);
-    c = (sexpr)((char *)c - sizeof(char *));
-    d = (sexpr)((char *)d - sizeof(char *));
-    check_ints(c,1,BIG);
-    check_uncollectable_ints(d, 1, 100);
-    check_ints(f[5], 1,17);
-    check_ints(g[799], 1,18);
-#   ifdef GC_GCJ_SUPPORT
-      h[1999] = gcj_reverse(h[1999]);
-#   endif
-    check_ints(h[1999], 1,200);
-#   ifndef THREADS
-	a = 0;
-#   endif  
-    b = c = 0;
-}
-
-#undef a
-
-/*
- * The rest of this builds balanced binary trees, checks that they don't
- * disappear, and tests finalization.
- */
-typedef struct treenode {
-    int level;
-    struct treenode * lchild;
-    struct treenode * rchild;
-} tn;
-
-int finalizable_count = 0;
-int finalized_count = 0;
-VOLATILE int dropped_something = 0;
-
-# ifdef __STDC__
-  void finalizer(void * obj, void * client_data)
-# else
-  void finalizer(obj, client_data)
-  char * obj;
-  char * client_data;
-# endif
-{
-  tn * t = (tn *)obj;
-
-# ifdef PCR
-     PCR_ThCrSec_EnterSys();
-# endif
-# if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-    static mutex_t incr_lock;
-    mutex_lock(&incr_lock);
-# endif
-# if  defined(GC_PTHREADS)
-    static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
-    pthread_mutex_lock(&incr_lock);
-# else
-#   ifdef GC_WIN32_THREADS
-      EnterCriticalSection(&incr_cs);
-#   endif
-# endif
-  if ((int)(GC_word)client_data != t -> level) {
-     (void)GC_printf0("Wrong finalization data - collector is broken\n");
-     FAIL;
-  }
-  finalized_count++;
-  t -> level = -1;	/* detect duplicate finalization immediately */
-# ifdef PCR
-    PCR_ThCrSec_ExitSys();
-# endif
-# if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-    mutex_unlock(&incr_lock);
-# endif
-# if defined(GC_PTHREADS)
-    pthread_mutex_unlock(&incr_lock);
-# else
-#   ifdef GC_WIN32_THREADS
-      LeaveCriticalSection(&incr_cs);
-#   endif
-# endif
-}
-
-size_t counter = 0;
-
-# define MAX_FINALIZED 8000
-
-# if !defined(MACOS)
-  GC_FAR GC_word live_indicators[MAX_FINALIZED] = {0};
-#else
-  /* Too big for THINK_C. have to allocate it dynamically. */
-  GC_word *live_indicators = 0;
-#endif
-
-int live_indicators_count = 0;
-
-tn * mktree(n)
-int n;
-{
-#   ifdef THREAD_LOCAL_ALLOC
-      tn * result = (tn *)GC_LOCAL_MALLOC(sizeof(tn));
-#   else
-      tn * result = (tn *)GC_MALLOC(sizeof(tn));
-#   endif
-    
-    collectable_count++;
-#   ifdef THREAD_LOCAL_ALLOC
-       /* Minimally exercise thread local allocation */
-       {
-         char * result = (char *)GC_LOCAL_MALLOC_ATOMIC(17);
-	 memset(result, 'a', 17);
-       }
-#   endif /* THREAD_LOCAL_ALLOC */
-#   if defined(MACOS)
-	/* get around static data limitations. */
-	if (!live_indicators)
-		live_indicators =
-		    (GC_word*)NewPtrClear(MAX_FINALIZED * sizeof(GC_word));
-	if (!live_indicators) {
-          (void)GC_printf0("Out of memory\n");
-          exit(1);
-        }
-#   endif
-    if (n == 0) return(0);
-    if (result == 0) {
-        (void)GC_printf0("Out of memory\n");
-        exit(1);
-    }
-    result -> level = n;
-    result -> lchild = mktree(n-1);
-    result -> rchild = mktree(n-1);
-    if (counter++ % 17 == 0 && n >= 2) {
-        tn * tmp = result -> lchild -> rchild;
-        
-        result -> lchild -> rchild = result -> rchild -> lchild;
-        result -> rchild -> lchild = tmp;
-    }
-    if (counter++ % 119 == 0) {
-        int my_index;
-        
-        {
-#	  ifdef PCR
- 	    PCR_ThCrSec_EnterSys();
-#	  endif
-#	  if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-	    static mutex_t incr_lock;
-	    mutex_lock(&incr_lock);
-#	  endif
-#         if defined(GC_PTHREADS)
-            static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
-            pthread_mutex_lock(&incr_lock);
-#         else
-#           ifdef GC_WIN32_THREADS
-              EnterCriticalSection(&incr_cs);
-#           endif
-#         endif
-		/* Losing a count here causes erroneous report of failure. */
-          finalizable_count++;
-          my_index = live_indicators_count++;
-#	  ifdef PCR
- 	    PCR_ThCrSec_ExitSys();
-#	  endif
-#	  if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-	    mutex_unlock(&incr_lock);
-#	  endif
-#	  if defined(GC_PTHREADS)
-	    pthread_mutex_unlock(&incr_lock);
-#	  else
-#           ifdef GC_WIN32_THREADS
-              LeaveCriticalSection(&incr_cs);
-#           endif
-#         endif
-	}
-
-        GC_REGISTER_FINALIZER((GC_PTR)result, finalizer, (GC_PTR)(GC_word)n,
-        		      (GC_finalization_proc *)0, (GC_PTR *)0);
-        if (my_index >= MAX_FINALIZED) {
-		GC_printf0("live_indicators overflowed\n");
-		FAIL;
-	}
-        live_indicators[my_index] = 13;
-        if (GC_GENERAL_REGISTER_DISAPPEARING_LINK(
-         	(GC_PTR *)(&(live_indicators[my_index])),
-         	(GC_PTR)result) != 0) {
-         	GC_printf0("GC_general_register_disappearing_link failed\n");
-         	FAIL;
-        }
-        if (GC_unregister_disappearing_link(
-         	(GC_PTR *)
-         	   (&(live_indicators[my_index]))) == 0) {
-         	GC_printf0("GC_unregister_disappearing_link failed\n");
-         	FAIL;
-        }
-        if (GC_GENERAL_REGISTER_DISAPPEARING_LINK(
-         	(GC_PTR *)(&(live_indicators[my_index])),
-         	(GC_PTR)result) != 0) {
-         	GC_printf0("GC_general_register_disappearing_link failed 2\n");
-         	FAIL;
-        }
-    }
-    return(result);
-}
-
-void chktree(t,n)
-tn *t;
-int n;
-{
-    if (n == 0 && t != 0) {
-        (void)GC_printf0("Clobbered a leaf - collector is broken\n");
-        FAIL;
-    }
-    if (n == 0) return;
-    if (t -> level != n) {
-        (void)GC_printf1("Lost a node at level %lu - collector is broken\n",
-        		 (unsigned long)n);
-        FAIL;
-    }
-    if (counter++ % 373 == 0) {
-	collectable_count++;
-	(void) GC_MALLOC(counter%5001);
-    }
-    chktree(t -> lchild, n-1);
-    if (counter++ % 73 == 0) {
-	collectable_count++;
-	(void) GC_MALLOC(counter%373);
-    }
-    chktree(t -> rchild, n-1);
-}
-
-# if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-thread_key_t fl_key;
-
-void * alloc8bytes()
-{
-# if defined(SMALL_CONFIG) || defined(GC_DEBUG)
-    collectable_count++;
-    return(GC_MALLOC(8));
-# else
-    void ** my_free_list_ptr;
-    void * my_free_list;
-    
-    if (thr_getspecific(fl_key, (void **)(&my_free_list_ptr)) != 0) {
-    	(void)GC_printf0("thr_getspecific failed\n");
-    	FAIL;
-    }
-    if (my_free_list_ptr == 0) {
-        uncollectable_count++;
-        my_free_list_ptr = GC_NEW_UNCOLLECTABLE(void *);
-        if (thr_setspecific(fl_key, my_free_list_ptr) != 0) {
-    	    (void)GC_printf0("thr_setspecific failed\n");
-    	    FAIL;
-        }
-    }
-    my_free_list = *my_free_list_ptr;
-    if (my_free_list == 0) {
-        collectable_count++;
-        my_free_list = GC_malloc_many(8);
-        if (my_free_list == 0) {
-            (void)GC_printf0("alloc8bytes out of memory\n");
-    	    FAIL;
-        }
-    }
-    *my_free_list_ptr = GC_NEXT(my_free_list);
-    GC_NEXT(my_free_list) = 0;
-    return(my_free_list);
-# endif
-}
-
-#else
-
-# if defined(GC_PTHREADS)
-pthread_key_t fl_key;
-
-void * alloc8bytes()
-{
-# if defined(SMALL_CONFIG) || defined(GC_DEBUG)
-    collectable_count++;
-    return(GC_MALLOC(8));
-# else
-    void ** my_free_list_ptr;
-    void * my_free_list;
-    
-    my_free_list_ptr = (void **)pthread_getspecific(fl_key);
-    if (my_free_list_ptr == 0) {
-        uncollectable_count++;
-        my_free_list_ptr = GC_NEW_UNCOLLECTABLE(void *);
-        if (pthread_setspecific(fl_key, my_free_list_ptr) != 0) {
-    	    (void)GC_printf0("pthread_setspecific failed\n");
-    	    FAIL;
-        }
-    }
-    my_free_list = *my_free_list_ptr;
-    if (my_free_list == 0) {
-        my_free_list = GC_malloc_many(8);
-        if (my_free_list == 0) {
-            (void)GC_printf0("alloc8bytes out of memory\n");
-    	    FAIL;
-        }
-    }
-    *my_free_list_ptr = GC_NEXT(my_free_list);
-    GC_NEXT(my_free_list) = 0;
-    collectable_count++;
-    return(my_free_list);
-# endif
-}
-
-# else
-#   define alloc8bytes() GC_MALLOC_ATOMIC(8)
-# endif
-#endif
-
-void alloc_small(n)
-int n;
-{
-    register int i;
-    
-    for (i = 0; i < n; i += 8) {
-        atomic_count++;
-        if (alloc8bytes() == 0) {
-            (void)GC_printf0("Out of memory\n");
-            FAIL;
-        }
-    }
-}
-
-# if defined(THREADS) && defined(GC_DEBUG)
-#   ifdef VERY_SMALL_CONFIG
-#     define TREE_HEIGHT 12
-#   else
-#     define TREE_HEIGHT 15
-#   endif
-# else
-#   ifdef VERY_SMALL_CONFIG
-#     define TREE_HEIGHT 13
-#   else
-#     define TREE_HEIGHT 16
-#   endif
-# endif
-void tree_test()
-{
-    tn * root;
-    register int i;
-    
-    root = mktree(TREE_HEIGHT);
-#   ifndef VERY_SMALL_CONFIG
-      alloc_small(5000000);
-#   endif
-    chktree(root, TREE_HEIGHT);
-    if (finalized_count && ! dropped_something) {
-        (void)GC_printf0("Premature finalization - collector is broken\n");
-        FAIL;
-    }
-    dropped_something = 1;
-    GC_noop(root);	/* Root needs to remain live until	*/
-    			/* dropped_something is set.		*/
-    root = mktree(TREE_HEIGHT);
-    chktree(root, TREE_HEIGHT);
-    for (i = TREE_HEIGHT; i >= 0; i--) {
-        root = mktree(i);
-        chktree(root, i);
-    }
-#   ifndef VERY_SMALL_CONFIG
-      alloc_small(5000000);
-#   endif
-}
-
-unsigned n_tests = 0;
-
-GC_word bm_huge[10] = {
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0xffffffff,
-    0x00ffffff,
-};
-
-/* A very simple test of explicitly typed allocation	*/
-void typed_test()
-{
-    GC_word * old, * new;
-    GC_word bm3 = 0x3;
-    GC_word bm2 = 0x2;
-    GC_word bm_large = 0xf7ff7fff;
-    GC_descr d1 = GC_make_descriptor(&bm3, 2);
-    GC_descr d2 = GC_make_descriptor(&bm2, 2);
-#   ifndef LINT
-      GC_descr dummy = GC_make_descriptor(&bm_large, 32);
-#   endif
-    GC_descr d3 = GC_make_descriptor(&bm_large, 32);
-    GC_descr d4 = GC_make_descriptor(bm_huge, 320);
-    GC_word * x = (GC_word *)GC_malloc_explicitly_typed(2000, d4);
-    register int i;
-    
-    collectable_count++;
-    old = 0;
-    for (i = 0; i < 4000; i++) {
-	collectable_count++;
-        new = (GC_word *) GC_malloc_explicitly_typed(4 * sizeof(GC_word), d1);
-        if (0 != new[0] || 0 != new[1]) {
-	    GC_printf0("Bad initialization by GC_malloc_explicitly_typed\n");
-	    FAIL;
-	}
-        new[0] = 17;
-        new[1] = (GC_word)old;
-        old = new;
-	collectable_count++;
-        new = (GC_word *) GC_malloc_explicitly_typed(4 * sizeof(GC_word), d2);
-        new[0] = 17;
-        new[1] = (GC_word)old;
-        old = new;
-	collectable_count++;
-        new = (GC_word *) GC_malloc_explicitly_typed(33 * sizeof(GC_word), d3);
-        new[0] = 17;
-        new[1] = (GC_word)old;
-        old = new;
-	collectable_count++;
-        new = (GC_word *) GC_calloc_explicitly_typed(4, 2 * sizeof(GC_word),
-        					     d1);
-        new[0] = 17;
-        new[1] = (GC_word)old;
-        old = new;
-	collectable_count++;
-        if (i & 0xff) {
-          new = (GC_word *) GC_calloc_explicitly_typed(7, 3 * sizeof(GC_word),
-        					     d2);
-        } else {
-          new = (GC_word *) GC_calloc_explicitly_typed(1001,
-          					       3 * sizeof(GC_word),
-        					       d2);
-          if (0 != new[0] || 0 != new[1]) {
-	    GC_printf0("Bad initialization by GC_malloc_explicitly_typed\n");
-	    FAIL;
-	  }
-        }
-        new[0] = 17;
-        new[1] = (GC_word)old;
-        old = new;
-    }
-    for (i = 0; i < 20000; i++) {
-        if (new[0] != 17) {
-            (void)GC_printf1("typed alloc failed at %lu\n",
-            		     (unsigned long)i);
-            FAIL;
-        }
-        new[0] = 0;
-        old = new;
-        new = (GC_word *)(old[1]);
-    }
-    GC_gcollect();
-    GC_noop(x);
-}
-
-int fail_count = 0;
-
-#ifndef __STDC__
-/*ARGSUSED*/
-void fail_proc1(x)
-GC_PTR x;
-{
-    fail_count++;
-}
-
-#else
-
-/*ARGSUSED*/
-void fail_proc1(GC_PTR x)
-{
-    fail_count++;
-}   
-
-static void uniq(void *p, ...) {
-  va_list a;
-  void *q[100];
-  int n = 0, i, j;
-  q[n++] = p;
-  va_start(a,p);
-  for (;(q[n] = va_arg(a,void *));n++) ;
-  va_end(a);
-  for (i=0; i<n; i++)
-    for (j=0; j<i; j++)
-      if (q[i] == q[j]) {
-        GC_printf0(
-              "Apparently failed to mark form some function arguments.\n"
-              "Perhaps GC_push_regs was configured incorrectly?\n"
-        );
-	FAIL;
-      }
-}
-
-#endif /* __STDC__ */
-
-#ifdef THREADS
-#   define TEST_FAIL_COUNT(n) 1
-#else 
-#   define TEST_FAIL_COUNT(n) (fail_count >= (n))
-#endif
-
-void run_one_test()
-{
-    char *x;
-#   ifdef LINT
-    	char *y = 0;
-#   else
-    	char *y = (char *)(size_t)fail_proc1;
-#   endif
-    DCL_LOCK_STATE;
-    
-#   ifdef FIND_LEAK
-	(void)GC_printf0(
-		"This test program is not designed for leak detection mode\n");
-	(void)GC_printf0("Expect lots of problems.\n");
-#   endif
-    GC_FREE(0);
-#   ifndef DBG_HDRS_ALL
-      collectable_count += 3;
-      if (GC_size(GC_malloc(7)) != 8 &&
-	  GC_size(GC_malloc(7)) != MIN_WORDS * sizeof(GC_word)
-	|| GC_size(GC_malloc(15)) != 16) {
-	    (void)GC_printf0("GC_size produced unexpected results\n");
-	    FAIL;
-      }
-      collectable_count += 1;
-      if (GC_size(GC_malloc(0)) != MIN_WORDS * sizeof(GC_word)) {
-    	(void)GC_printf1("GC_malloc(0) failed: GC_size returns %ld\n",
-			 GC_size(GC_malloc(0)));
-	    FAIL;
-      }
-      collectable_count += 1;
-      if (GC_size(GC_malloc_uncollectable(0)) != MIN_WORDS * sizeof(GC_word)) {
-    	(void)GC_printf0("GC_malloc_uncollectable(0) failed\n");
-	    FAIL;
-      }
-      GC_is_valid_displacement_print_proc = fail_proc1;
-      GC_is_visible_print_proc = fail_proc1;
-      collectable_count += 1;
-      x = GC_malloc(16);
-      if (GC_base(x + 13) != x) {
-    	(void)GC_printf0("GC_base(heap ptr) produced incorrect result\n");
-	FAIL;
-      }
-#     ifndef PCR
-        if (GC_base(y) != 0) {
-    	  (void)GC_printf0("GC_base(fn_ptr) produced incorrect result\n");
-	  FAIL;
-        }
-#     endif
-      if (GC_same_obj(x+5, x) != x + 5) {
-    	(void)GC_printf0("GC_same_obj produced incorrect result\n");
-	FAIL;
-      }
-      if (GC_is_visible(y) != y || GC_is_visible(x) != x) {
-    	(void)GC_printf0("GC_is_visible produced incorrect result\n");
-	FAIL;
-      }
-      if (!TEST_FAIL_COUNT(1)) {
-#	if!(defined(RS6000) || defined(POWERPC) || defined(IA64)) || defined(M68K)
-	  /* ON RS6000s function pointers point to a descriptor in the	*/
-	  /* data segment, so there should have been no failures.	*/
-	  /* The same applies to IA64.  Something similar seems to	*/
-	  /* be going on with NetBSD/M68K.				*/
-    	  (void)GC_printf0("GC_is_visible produced wrong failure indication\n");
-    	  FAIL;
-#	endif
-      }
-      if (GC_is_valid_displacement(y) != y
-        || GC_is_valid_displacement(x) != x
-        || GC_is_valid_displacement(x + 3) != x + 3) {
-    	(void)GC_printf0(
-    		"GC_is_valid_displacement produced incorrect result\n");
-	FAIL;
-      }
-#     if defined(__STDC__) && !defined(MSWIN32) && !defined(MSWINCE)
-        /* Harder to test under Windows without a gc.h declaration.  */
-        {
-	  size_t i;
-	  extern void *GC_memalign();
-
-	  GC_malloc(17);
-	  for (i = sizeof(GC_word); i < 512; i *= 2) {
-	    GC_word result = (GC_word) GC_memalign(i, 17);
-	    if (result % i != 0 || result == 0 || *(int *)result != 0) FAIL;
-	  } 
-	}
-#     endif
-#     ifndef ALL_INTERIOR_POINTERS
-#      if defined(RS6000) || defined(POWERPC)
-        if (!TEST_FAIL_COUNT(1)) {
-#      else
-        if (GC_all_interior_pointers && !TEST_FAIL_COUNT(1)
-	    || !GC_all_interior_pointers && !TEST_FAIL_COUNT(2)) {
-#      endif
-    	  (void)GC_printf0("GC_is_valid_displacement produced wrong failure indication\n");
-    	  FAIL;
-        }
-#     endif
-#   endif /* DBG_HDRS_ALL */
-    /* Test floating point alignment */
-   collectable_count += 2;
-	*(double *)GC_MALLOC(sizeof(double)) = 1.0;
-	*(double *)GC_MALLOC(sizeof(double)) = 1.0;
-#   ifdef GC_GCJ_SUPPORT
-      GC_REGISTER_DISPLACEMENT(sizeof(struct fake_vtable *));
-      GC_init_gcj_malloc(0, (void *)fake_gcj_mark_proc);
-#   endif
-    /* Make sure that fn arguments are visible to the collector.	*/
-#   ifdef __STDC__
-      uniq(
-        GC_malloc(12), GC_malloc(12), GC_malloc(12),
-        (GC_gcollect(),GC_malloc(12)),
-        GC_malloc(12), GC_malloc(12), GC_malloc(12),
-	(GC_gcollect(),GC_malloc(12)),
-        GC_malloc(12), GC_malloc(12), GC_malloc(12),
-	(GC_gcollect(),GC_malloc(12)),
-        GC_malloc(12), GC_malloc(12), GC_malloc(12),
-	(GC_gcollect(),GC_malloc(12)),
-        GC_malloc(12), GC_malloc(12), GC_malloc(12),
-	(GC_gcollect(),GC_malloc(12)),
-        (void *)0);
-#   endif
-    /* Repeated list reversal test. */
-	reverse_test();
-#   ifdef PRINTSTATS
-	GC_printf0("-------------Finished reverse_test\n");
-#   endif
-#   ifndef DBG_HDRS_ALL
-      typed_test();
-#     ifdef PRINTSTATS
-	GC_printf0("-------------Finished typed_test\n");
-#     endif
-#   endif /* DBG_HDRS_ALL */
-    tree_test();
-    LOCK();
-    n_tests++;
-    UNLOCK();
-#   if defined(THREADS) && defined(HANDLE_FORK)
-      if (fork() == 0) {
-	GC_gcollect();
-	tiny_reverse_test(0);
-	GC_gcollect();
-	GC_printf0("Finished a child process\n");
-	exit(0);
-      }
-#   endif
-    /* GC_printf1("Finished %x\n", pthread_self()); */
-}
-
-void check_heap_stats()
-{
-    unsigned long max_heap_sz;
-    register int i;
-    int still_live;
-    int late_finalize_count = 0;
-    
-#   ifdef VERY_SMALL_CONFIG
-    /* these are something of a guess */
-    if (sizeof(char *) > 4) {
-        max_heap_sz = 4500000;
-    } else {
-    	max_heap_sz = 2800000;
-    }
-#   else
-    if (sizeof(char *) > 4) {
-        max_heap_sz = 19000000;
-    } else {
-    	max_heap_sz = 11000000;
-    }
-#   endif
-#   ifndef ALIGN_DOUBLE
-        /* We end up needing more small object pages. */
-        max_heap_sz += 2000000;
-#   endif
-#   ifdef GC_DEBUG
-	max_heap_sz *= 2;
-#       ifdef SAVE_CALL_CHAIN
-	    max_heap_sz *= 3;
-#           ifdef SAVE_CALL_COUNT
-		max_heap_sz += max_heap_sz * SAVE_CALL_COUNT/4;
-#	    endif
-#       endif
-#   endif
-    /* Garbage collect repeatedly so that all inaccessible objects	*/
-    /* can be finalized.						*/
-      while (GC_collect_a_little()) { }
-      for (i = 0; i < 16; i++) {
-        GC_gcollect();
-        late_finalize_count += GC_invoke_finalizers();
-      }
-    (void)GC_printf1("Completed %lu tests\n", (unsigned long)n_tests);
-    (void)GC_printf1("Allocated %lu collectable objects\n", (unsigned long)collectable_count);
-    (void)GC_printf1("Allocated %lu uncollectable objects\n", (unsigned long)uncollectable_count);
-    (void)GC_printf1("Allocated %lu atomic objects\n", (unsigned long)atomic_count);
-    (void)GC_printf1("Allocated %lu stubborn objects\n", (unsigned long)stubborn_count);
-    (void)GC_printf2("Finalized %lu/%lu objects - ",
-    		     (unsigned long)finalized_count,
-    		     (unsigned long)finalizable_count);
-#   ifdef FINALIZE_ON_DEMAND
-	if (finalized_count != late_finalize_count) {
-            (void)GC_printf0("Demand finalization error\n");
-	    FAIL;
-	}
-#   endif
-    if (finalized_count > finalizable_count
-        || finalized_count < finalizable_count/2) {
-        (void)GC_printf0("finalization is probably broken\n");
-        FAIL;
-    } else {
-        (void)GC_printf0("finalization is probably ok\n");
-    }
-    still_live = 0;
-    for (i = 0; i < MAX_FINALIZED; i++) {
-    	if (live_indicators[i] != 0) {
-    	    still_live++;
-    	}
-    }
-    i = finalizable_count - finalized_count - still_live;
-    if (0 != i) {
-        (void)GC_printf2
-            ("%lu disappearing links remain and %ld more objects were not finalized\n",
-             (unsigned long) still_live, (long)i);
-        if (i > 10) {
-	    GC_printf0("\tVery suspicious!\n");
-	} else {
-	    GC_printf0("\tSlightly suspicious, but probably OK.\n");
-	}
-    }
-    (void)GC_printf1("Total number of bytes allocated is %lu\n",
-    		(unsigned long)
-    	           WORDS_TO_BYTES(GC_words_allocd + GC_words_allocd_before_gc));
-    (void)GC_printf1("Final heap size is %lu bytes\n",
-    		     (unsigned long)GC_get_heap_size());
-    if (WORDS_TO_BYTES(GC_words_allocd + GC_words_allocd_before_gc)
-#   ifdef VERY_SMALL_CONFIG
-        < 2700000*n_tests) {
-#   else
-        < 33500000*n_tests) {
-#   endif
-        (void)GC_printf0("Incorrect execution - missed some allocations\n");
-        FAIL;
-    }
-    if (GC_get_heap_size() > max_heap_sz*n_tests) {
-        (void)GC_printf0("Unexpected heap growth - collector may be broken\n");
-        FAIL;
-    }
-    (void)GC_printf0("Collector appears to work\n");
-}
-
-#if defined(MACOS)
-void SetMinimumStack(long minSize)
-{
-	long newApplLimit;
-
-	if (minSize > LMGetDefltStack())
-	{
-		newApplLimit = (long) GetApplLimit()
-				- (minSize - LMGetDefltStack());
-		SetApplLimit((Ptr) newApplLimit);
-		MaxApplZone();
-	}
-}
-
-#define cMinStackSpace (512L * 1024L)
-
-#endif
-
-#ifdef __STDC__
-    void warn_proc(char *msg, GC_word p)
-#else
-    void warn_proc(msg, p)
-    char *msg;
-    GC_word p;
-#endif
-{
-    GC_printf1(msg, (unsigned long)p);
-    /*FAIL;*/
-}
-
-
-#if !defined(PCR) && !defined(GC_SOLARIS_THREADS) \
-    && !defined(GC_WIN32_THREADS) && !defined(GC_PTHREADS) \
-    || defined(LINT)
-#if defined(MSWIN32) && !defined(__MINGW32__)
-  int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prev, LPTSTR cmd, int n)
-#else
-  int main()
-#endif
-{
-#   if defined(DJGPP)
-	int dummy;
-#   endif
-    n_tests = 0;
-    
-#   if defined(DJGPP)
-	/* No good way to determine stack base from library; do it */
-	/* manually on this platform.				   */
-    	GC_stackbottom = (GC_PTR)(&dummy);
-#   endif
-#   if defined(MACOS)
-	/* Make sure we have lots and lots of stack space. 	*/
-	SetMinimumStack(cMinStackSpace);
-	/* Cheat and let stdio initialize toolbox for us.	*/
-	printf("Testing GC Macintosh port.\n");
-#   endif
-    GC_INIT();	/* Only needed on a few platforms.	*/
-    (void) GC_set_warn_proc(warn_proc);
-#   if (defined(MPROTECT_VDB) || defined(PROC_VDB)) \
-          && !defined(MAKE_BACK_GRAPH)
-      GC_enable_incremental();
-      (void) GC_printf0("Switched to incremental mode\n");
-#     if defined(MPROTECT_VDB)
-	(void)GC_printf0("Emulating dirty bits with mprotect/signals\n");
-#     else
-#       ifdef PROC_VDB
-	(void)GC_printf0("Reading dirty bits from /proc\n");
-#       else
-    (void)GC_printf0("Using DEFAULT_VDB dirty bit implementation\n");
-#       endif
-#      endif
-#   endif
-    run_one_test();
-    check_heap_stats();
-#   ifndef MSWINCE
-    (void)fflush(stdout);
-#   endif
-#   ifdef LINT
-	/* Entry points we should be testing, but aren't.		   */
-	/* Some can be tested by defining GC_DEBUG at the top of this file */
-	/* This is a bit SunOS4 specific.				   */			
-	GC_noop(GC_expand_hp, GC_add_roots, GC_clear_roots,
-	        GC_register_disappearing_link,
-	        GC_register_finalizer_ignore_self,
-		GC_debug_register_displacement,
-	        GC_print_obj, GC_debug_change_stubborn,
-	        GC_debug_end_stubborn_change, GC_debug_malloc_uncollectable,
-	        GC_debug_free, GC_debug_realloc, GC_generic_malloc_words_small,
-	        GC_init, GC_make_closure, GC_debug_invoke_finalizer,
-	        GC_page_was_ever_dirty, GC_is_fresh,
-		GC_malloc_ignore_off_page, GC_malloc_atomic_ignore_off_page,
-		GC_set_max_heap_size, GC_get_bytes_since_gc,
-		GC_get_total_bytes, GC_pre_incr, GC_post_incr);
-#   endif
-#   ifdef MSWIN32
-      GC_win32_free_heap();
-#   endif
-    return(0);
-}
-# endif
-
-#if defined(GC_WIN32_THREADS) && !defined(CYGWIN32)
-
-DWORD __stdcall thr_run_one_test(void *arg)
-{
-  run_one_test();
-  return 0;
-}
-
-#ifdef MSWINCE
-HANDLE win_created_h;
-HWND win_handle;
-
-LRESULT CALLBACK window_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  LRESULT ret = 0;
-  switch (uMsg) {
-    case WM_HIBERNATE:
-      GC_printf0("Received WM_HIBERNATE, calling GC_gcollect\n");
-      GC_gcollect();
-      break;
-    case WM_CLOSE:
-      GC_printf0("Received WM_CLOSE, closing window\n");
-      DestroyWindow(hwnd);
-      break;
-    case WM_DESTROY:
-      PostQuitMessage(0);
-      break;
-    default:
-      ret = DefWindowProc(hwnd, uMsg, wParam, lParam);
-      break;
-  }
-  return ret;
-}
-
-DWORD __stdcall thr_window(void *arg)
-{
-  WNDCLASS win_class = {
-    CS_NOCLOSE,
-    window_proc,
-    0,
-    0,
-    GetModuleHandle(NULL),
-    NULL,
-    NULL,
-    (HBRUSH)(COLOR_APPWORKSPACE+1),
-    NULL,
-    L"GCtestWindow"
-  };
-  MSG msg;
-
-  if (!RegisterClass(&win_class))
-    FAIL;
-
-  win_handle = CreateWindowEx(
-    0,
-    L"GCtestWindow",
-    L"GCtest",
-    0,
-    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-    NULL,
-    NULL,
-    GetModuleHandle(NULL),
-    NULL);
-
-  if (win_handle == NULL)
-    FAIL;
-
-  SetEvent(win_created_h);
-
-  ShowWindow(win_handle, SW_SHOW);
-  UpdateWindow(win_handle);
-
-  while (GetMessage(&msg, NULL, 0, 0)) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-
-  return 0;
-}
-#endif
-
-#define NTEST 2
-
-# ifdef MSWINCE
-int APIENTRY GC_WinMain(HINSTANCE instance, HINSTANCE prev, LPWSTR cmd, int n)
-#   else
-int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prev, LPSTR cmd, int n)
-# endif
-{
-# if NTEST > 0
-   HANDLE h[NTEST];
-   int i;
-# endif
-# ifdef MSWINCE
-    HANDLE win_thr_h;
-# endif
-  DWORD thread_id;
-# if 0
-    GC_enable_incremental();
-# endif
-  GC_init();
-  InitializeCriticalSection(&incr_cs);
-  (void) GC_set_warn_proc(warn_proc);
-# ifdef MSWINCE
-    win_created_h = CreateEvent(NULL, FALSE, FALSE, NULL);
-    if (win_created_h == (HANDLE)NULL) {
-      (void)GC_printf1("Event creation failed %lu\n", (unsigned long)GetLastError());
-      FAIL;
-    }
-    win_thr_h = GC_CreateThread(NULL, 0, thr_window, 0, 0, &thread_id);
-    if (win_thr_h == (HANDLE)NULL) {
-      (void)GC_printf1("Thread creation failed %lu\n", (unsigned long)GetLastError());
-      FAIL;
-    }
-    if (WaitForSingleObject(win_created_h, INFINITE) != WAIT_OBJECT_0)
-      FAIL;
-    CloseHandle(win_created_h);
-# endif
-# if NTEST > 0
-   for (i = 0; i < NTEST; i++) {
-    h[i] = GC_CreateThread(NULL, 0, thr_run_one_test, 0, 0, &thread_id);
-    if (h[i] == (HANDLE)NULL) {
-      (void)GC_printf1("Thread creation failed %lu\n", (unsigned long)GetLastError());
-      FAIL;
-    }
-   }
-# endif /* NTEST > 0 */
-  run_one_test();
-# if NTEST > 0
-   for (i = 0; i < NTEST; i++) {
-    if (WaitForSingleObject(h[i], INFINITE) != WAIT_OBJECT_0) {
-      (void)GC_printf1("Thread wait failed %lu\n", (unsigned long)GetLastError());
-      FAIL;
-    }
-   }
-# endif /* NTEST > 0 */
-# ifdef MSWINCE
-    PostMessage(win_handle, WM_CLOSE, 0, 0);
-    if (WaitForSingleObject(win_thr_h, INFINITE) != WAIT_OBJECT_0)
-      FAIL;
-# endif
-  check_heap_stats();
-  return(0);
-}
-
-#endif /* GC_WIN32_THREADS */
-
-
-#ifdef PCR
-int
-test()
-{
-    PCR_Th_T * th1;
-    PCR_Th_T * th2;
-    int code;
-
-    n_tests = 0;
-    /* GC_enable_incremental(); */
-    (void) GC_set_warn_proc(warn_proc);
-    th1 = PCR_Th_Fork(run_one_test, 0);
-    th2 = PCR_Th_Fork(run_one_test, 0);
-    run_one_test();
-    if (PCR_Th_T_Join(th1, &code, NIL, PCR_allSigsBlocked, PCR_waitForever)
-        != PCR_ERes_okay || code != 0) {
-        (void)GC_printf0("Thread 1 failed\n");
-    }
-    if (PCR_Th_T_Join(th2, &code, NIL, PCR_allSigsBlocked, PCR_waitForever)
-        != PCR_ERes_okay || code != 0) {
-        (void)GC_printf0("Thread 2 failed\n");
-    }
-    check_heap_stats();
-    return(0);
-}
-#endif
-
-#if defined(GC_SOLARIS_THREADS) || defined(GC_PTHREADS)
-void * thr_run_one_test(void * arg)
-{
-    run_one_test();
-    return(0);
-}
-
-#ifdef GC_DEBUG
-#  define GC_free GC_debug_free
-#endif
-
-#if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-int
-main()
-{
-    thread_t th1;
-    thread_t th2;
-    int code;
-
-    n_tests = 0;
-    GC_INIT();	/* Only needed if gc is dynamic library.	*/
-#   ifndef MAKE_BACK_GRAPH
-      GC_enable_incremental();
-#   endif
-    (void) GC_set_warn_proc(warn_proc);
-    if (thr_keycreate(&fl_key, GC_free) != 0) {
-        (void)GC_printf1("Key creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    if ((code = thr_create(0, 1024*1024, thr_run_one_test, 0, 0, &th1)) != 0) {
-    	(void)GC_printf1("Thread 1 creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    if ((code = thr_create(0, 1024*1024, thr_run_one_test, 0, THR_NEW_LWP, &th2)) != 0) {
-    	(void)GC_printf1("Thread 2 creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    run_one_test();
-    if ((code = thr_join(th1, 0, 0)) != 0) {
-        (void)GC_printf1("Thread 1 failed %lu\n", (unsigned long)code);
-        FAIL;
-    }
-    if (thr_join(th2, 0, 0) != 0) {
-        (void)GC_printf1("Thread 2 failed %lu\n", (unsigned long)code);
-        FAIL;
-    }
-    check_heap_stats();
-    (void)fflush(stdout);
-    return(0);
-}
-#else /* pthreads */
-
-#ifndef GC_PTHREADS
-  --> bad news
-#endif
-
-int
-main()
-{
-    pthread_t th1;
-    pthread_t th2;
-    pthread_attr_t attr;
-    int code;
-
-#   ifdef GC_IRIX_THREADS
-	/* Force a larger stack to be preallocated      */
-	/* Since the initial cant always grow later.	*/
-	*((volatile char *)&code - 1024*1024) = 0;      /* Require 1 Mb */
-#   endif /* GC_IRIX_THREADS */
-#   if defined(GC_HPUX_THREADS)
-	/* Default stack size is too small, especially with the 64 bit ABI */
-	/* Increase it.							   */
-	if (pthread_default_stacksize_np(1024*1024, 0) != 0) {
-          (void)GC_printf0("pthread_default_stacksize_np failed.\n");
-	}
-#   endif	/* GC_HPUX_THREADS */
-    GC_INIT();
-
-    pthread_attr_init(&attr);
-#   if defined(GC_IRIX_THREADS) || defined(GC_FREEBSD_THREADS) \
-    	|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)
-    	pthread_attr_setstacksize(&attr, 1000000);
-#   endif
-    n_tests = 0;
-#   if (defined(MPROTECT_VDB)) \
-            && !defined(PARALLEL_MARK) &&!defined(REDIRECT_MALLOC) \
-            && !defined(MAKE_BACK_GRAPH)
-    	GC_enable_incremental();
-        (void) GC_printf0("Switched to incremental mode\n");
-#     if defined(MPROTECT_VDB)
-        (void)GC_printf0("Emulating dirty bits with mprotect/signals\n");
-#     else
-#       ifdef PROC_VDB
-            (void)GC_printf0("Reading dirty bits from /proc\n");
-#       else
-            (void)GC_printf0("Using DEFAULT_VDB dirty bit implementation\n");
-#       endif
-#     endif
-#   endif
-    (void) GC_set_warn_proc(warn_proc);
-    if ((code = pthread_key_create(&fl_key, 0)) != 0) {
-        (void)GC_printf1("Key creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    if ((code = pthread_create(&th1, &attr, thr_run_one_test, 0)) != 0) {
-    	(void)GC_printf1("Thread 1 creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    if ((code = pthread_create(&th2, &attr, thr_run_one_test, 0)) != 0) {
-    	(void)GC_printf1("Thread 2 creation failed %lu\n", (unsigned long)code);
-    	FAIL;
-    }
-    run_one_test();
-    if ((code = pthread_join(th1, 0)) != 0) {
-        (void)GC_printf1("Thread 1 failed %lu\n", (unsigned long)code);
-        FAIL;
-    }
-    if (pthread_join(th2, 0) != 0) {
-        (void)GC_printf1("Thread 2 failed %lu\n", (unsigned long)code);
-        FAIL;
-    }
-    check_heap_stats();
-    (void)fflush(stdout);
-    pthread_attr_destroy(&attr);
-    GC_printf1("Completed %d collections\n", GC_gc_no);
-    return(0);
-}
-#endif /* GC_PTHREADS */
-#endif /* GC_SOLARIS_THREADS || GC_PTHREADS */
diff --git a/boehm-gc/testsuite/boehm-gc.c/leak_test.c b/boehm-gc/testsuite/boehm-gc.c/leak_test.c
deleted file mode 100644
index bf563ac1c16..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/leak_test.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "leak_detector.h"
-
-int main() {
-    int *p[10];
-    int i;
-    GC_find_leak = 1; /* for new collect versions not compiled  */
-    /* with -DFIND_LEAK.                                        */
-    for (i = 0; i < 10; ++i) {
-        p[i] = malloc(sizeof(int)+i);
-    }
-    CHECK_LEAKS();
-    for (i = 1; i < 10; ++i) {
-        free(p[i]);
-    }
-    for (i = 0; i < 9; ++i) {
-        p[i] = malloc(sizeof(int)+i);
-    }
-    CHECK_LEAKS();
-    CHECK_LEAKS();
-    CHECK_LEAKS();
-    return 0;
-}       
diff --git a/boehm-gc/testsuite/boehm-gc.c/middle.c b/boehm-gc/testsuite/boehm-gc.c/middle.c
deleted file mode 100644
index 5d9360af521..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/middle.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Test at the boundary between small and large objects.
- * Inspired by a test case from Zoltan Varga.
- */
-#include <gc.h>
-#include <stdio.h>
-
-int main ()
-{
-        int i;
-
-        GC_all_interior_pointers = 0;
-
-        for (i = 0; i < 20000; ++i) {
-                GC_malloc_atomic (4096);
-                GC_malloc (4096);
-	}
-        for (i = 0; i < 20000; ++i) {
-                GC_malloc_atomic (2048);
-                GC_malloc (2048);
-	}
-	printf("Final heap size is %ld\n", GC_get_heap_size());
-	return 0;
-}
-
diff --git a/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c b/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c
deleted file mode 100644
index 89014651261..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef GC_THREADS
-# define GC_THREADS
-#endif
-#include "leak_detector.h"
-#ifdef GC_PTHREADS
-# include <pthread.h>
-#else
-# include <windows.h>
-#endif
-#include <stdio.h>
-
-#ifdef GC_PTHREADS
-  void * test(void * arg)
-#else
-  DWORD WINAPI test(LPVOID arg)
-#endif
-{
-    int *p[10];
-    int i;
-    for (i = 0; i < 10; ++i) {
-        p[i] = malloc(sizeof(int)+i);
-    }
-    CHECK_LEAKS();
-    for (i = 1; i < 10; ++i) {
-        free(p[i]);
-    }
-#ifdef GC_PTHREADS
-    return arg;
-#else
-    return (DWORD)(GC_word)arg;
-#endif
-}
-
-#define NTHREADS 5
-
-int main(void) {
-    int i;
-#ifdef GC_PTHREADS
-    pthread_t t[NTHREADS];
-#else
-    HANDLE t[NTHREADS];
-    DWORD thread_id;
-#endif
-    int code;
-
-    GC_find_leak = 1;    /* for new collect versions not compiled       */
-    GC_INIT();
-    for (i = 0; i < NTHREADS; ++i) {
-#ifdef GC_PTHREADS
-       code = pthread_create(t + i, 0, test, 0);
-#else
-       t[i] = CreateThread(NULL, 0, test, 0, 0, &thread_id);
-       code = t[i] != NULL ? 0 : (int)GetLastError();
-#endif
-       if (code != 0) {
-          printf("Thread creation failed %d\n", code);
-        }
-    }
-    for (i = 0; i < NTHREADS; ++i) {
-#ifdef GC_PTHREADS
-       code = pthread_join(t[i], 0);
-#else
-       code = WaitForSingleObject(t[i], INFINITE) == WAIT_OBJECT_0 ? 0 :
-                                                        (int)GetLastError();
-#endif
-       if (code != 0) {
-          printf("Thread join failed %d\n", code);
-        }
-    }
-    CHECK_LEAKS();
-    CHECK_LEAKS();
-    CHECK_LEAKS();
-    return 0;
-}
diff --git a/boehm-gc/testsuite/boehm-gc.c/trace_test.c b/boehm-gc/testsuite/boehm-gc.c/trace_test.c
deleted file mode 100644
index 00bcadf19ad..00000000000
--- a/boehm-gc/testsuite/boehm-gc.c/trace_test.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* { dg-skip-if "requires --enable-gc-debug" *-*-* } */
-
-#include <stdio.h>
-#define GC_DEBUG
-#include "gc.h"
-
-struct treenode {
-    struct treenode *x;
-    struct treenode *y;
-} * root[10];
-
-struct treenode * mktree(int i) {
-  struct treenode * r = GC_MALLOC(sizeof(struct treenode));
-  if (0 == i) return 0;
-  if (1 == i) r = GC_MALLOC_ATOMIC(sizeof(struct treenode));
-  r -> x = mktree(i-1);
-  r -> y = mktree(i-1);
-  return r;
-}
-
-int main()
-{
-  int i;
-  for (i = 0; i < 10; ++i) {
-    root[i] = mktree(12);
-  }
-  GC_generate_random_backtrace();
-  GC_generate_random_backtrace();
-  GC_generate_random_backtrace();
-  GC_generate_random_backtrace();
-  return 0;
-}
diff --git a/boehm-gc/testsuite/boehm-gc.lib/lib.exp b/boehm-gc/testsuite/boehm-gc.lib/lib.exp
deleted file mode 100644
index f7b83d85ed5..00000000000
--- a/boehm-gc/testsuite/boehm-gc.lib/lib.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-dg-init
-boehm-gc-init
-
-# Gather list of tests, skipping library source files.
-set tests [lsort [glob -nocomplain $srcdir/$subdir/*.c]]
-set tests [prune $tests $srcdir/$subdir/*lib.c]
-
-boehm-gc-dg-runtest $tests "-O2" ""
-
-dg-finish
diff --git a/boehm-gc/testsuite/boehm-gc.lib/staticrootslib.c b/boehm-gc/testsuite/boehm-gc.lib/staticrootslib.c
deleted file mode 100644
index 6e13278a6c0..00000000000
--- a/boehm-gc/testsuite/boehm-gc.lib/staticrootslib.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <stdio.h>
-
-#ifndef GC_DEBUG
-# define GC_DEBUG
-#endif
-
-#include "gc.h"
-
-struct treenode {
-    struct treenode *x;
-    struct treenode *y;
-} * root[10];
-
-struct treenode * libsrl_mktree(int i)
-{
-  struct treenode * r = GC_MALLOC(sizeof(struct treenode));
-  if (0 == i) return 0;
-  if (1 == i) r = GC_MALLOC_ATOMIC(sizeof(struct treenode));
-  r -> x = libsrl_mktree(i-1);
-  r -> y = libsrl_mktree(i-1);
-  return r;
-}
-
-void * libsrl_init(void)
-{
-  GC_INIT();
-  return GC_MALLOC(sizeof(struct treenode));
-}
-
-void * libsrl_collect (void)
-{
-  GC_gcollect();
-}
diff --git a/boehm-gc/testsuite/boehm-gc.lib/staticrootstest.c b/boehm-gc/testsuite/boehm-gc.lib/staticrootstest.c
deleted file mode 100644
index a029ccf4276..00000000000
--- a/boehm-gc/testsuite/boehm-gc.lib/staticrootstest.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* { dg-add-shlib "staticrootslib.c" } */
-
-#include <stdio.h>
-
-#ifndef GC_DEBUG
-# define GC_DEBUG
-#endif
-
-#include "gc.h"
-#include "gc_backptr.h"
-
-struct treenode {
-    struct treenode *x;
-    struct treenode *y;
-} * root[10];
-
-static char *staticroot = 0;
-
-extern struct treenode * libsrl_mktree(int i);
-extern void * libsrl_init(void);
-extern void * libsrl_collect (void);
-
-int main(void)
-{
-  int i;
-  staticroot = libsrl_init();
-  for (i = 0; i < sizeof(struct treenode); ++i) {
-    staticroot[i] = 0x42;
-  }
-  libsrl_collect();
-  for (i = 0; i < 10; ++i) {
-    root[i] = libsrl_mktree(12);
-    libsrl_collect();
-  }
-  for (i = 0; i < sizeof(struct treenode); ++i) {
-    if (staticroot[i] != 0x42)
-      return -1;
-  }
-  for (i = 0; i < 10; ++i) {
-    root[i] = libsrl_mktree(12);
-    libsrl_collect();
-  }
-  for (i = 0; i < sizeof(struct treenode); ++i) {
-    if (staticroot[i] != 0x42)
-      return -1;
-  }
-  return 0;
-}
diff --git a/boehm-gc/testsuite/config/default.exp b/boehm-gc/testsuite/config/default.exp
deleted file mode 100644
index 90967cccc18..00000000000
--- a/boehm-gc/testsuite/config/default.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "standard.exp"
diff --git a/boehm-gc/testsuite/lib/boehm-gc.exp b/boehm-gc/testsuite/lib/boehm-gc.exp
deleted file mode 100644
index d162035b63b..00000000000
--- a/boehm-gc/testsuite/lib/boehm-gc.exp
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-proc load_gcc_lib { filename } {
-    global srcdir loaded_libs
-    load_file $srcdir/../../gcc/testsuite/lib/$filename
-    set loaded_libs($filename) ""
-}
-
-load_lib dg.exp
-load_gcc_lib target-libpath.exp
-load_gcc_lib wrapper.exp
-# Required by target-supports-dg.exp.
-load_gcc_lib target-supports.exp
-# For dg-skip-if.
-load_gcc_lib target-supports-dg.exp
-load_gcc_lib target-utils.exp
-# For ${tool}_exit.
-load_gcc_lib gcc-defs.exp
-# For prune_gcc_output.
-load_gcc_lib multiline.exp
-load_gcc_lib prune.exp
-
-set dg-do-what-default run
-
-# Define boehm-gc callbacks for dg.exp.
-
-# FIXME: The next two are independent of boehm-gc; move to some library.
-proc ${tool}-dg-test-1 { target_compile prog do_what extra_tool_flags } {
-
-    # Set up the compiler flags, based on what we're going to do.
-
-    set options [list]
-    switch $do_what {
-	"compile" {
-	    set compile_type "assembly"
-	    set output_file "[file rootname [file tail $prog]].s"
-	}
-        "assemble" {
-            set compile_type "object"
-            set output_file "[file rootname [file tail $prog]].o"
-        }
-        "ltassemble" {
-	    # Needs to be different from assemble since we cannot determine
-	    # from $prog whether to produce a regular or a libtool object.
-            set compile_type "object"
-            set output_file "[file rootname [file tail $prog]].lo"
-        }
-	"link" {
-	    set compile_type "executable"
-	    # Don't add .exe extension, libtool may strip if from output file.
-	    set output_file "[file rootname [file tail $prog]]"
-	    # If we're linking a libtool object, produce a libtool library.
-	    if { [file extension $prog] == ".lo" } {
-		set output_file "lib$output_file.la"
-	    }
-	}
-	"run" {
-	    set compile_type "executable"
-	    # FIXME: "./" is to cope with "." not being in $PATH.
-	    # Should this be handled elsewhere?
-	    # YES.
-	    set output_file "./[file rootname [file tail $prog]]"
-	    # This is the only place where we care if an executable was
-	    # created or not.  If it was, dg.exp will try to run it.
-	    remote_file build delete $output_file
-	}
-	default {
-	    perror "$do_what: not a valid dg-do keyword"
-	    return ""
-	}
-    }
-
-    if { $extra_tool_flags != "" } {
-	lappend options "additional_flags=$extra_tool_flags"
-    }
-
-    set comp_output [$target_compile "$prog" "$output_file" "$compile_type" $options];
-
-    return [list $comp_output $output_file]
-}
-
-proc ${tool}-dg-test { prog do_what extra_tool_flags } {
-    global tool
-
-    return [${tool}-dg-test-1 ${tool}_target_compile $prog $do_what $extra_tool_flags]
-}
-
-proc boehm-gc-init { args } {
-    global gluefile wrap_flags
-    global srcdir
-    global blddirgc
-    global TOOL_EXECUTABLE
-    global GCC_UNDER_TEST
-    global objdir
-    global gc_include
-    global gc_lib
-    global gc_lib_conv
-    global tool
-    global tool_root_dir
-    global ld_library_path
-
-    set blddirgc [lookfor_file [get_multilibs] ${tool}]
-    verbose "blddirgc: $blddirgc"
-
-    if ![info exists GCC_UNDER_TEST] then {
-	if [info exists TOOL_EXECUTABLE] {
-	    set GCC_UNDER_TEST $TOOL_EXECUTABLE
-	} else {
-	    set GCC_UNDER_TEST "[find_gcc]"
-	}
-    }
-
-    set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
-    if {$gccdir != ""} {
-	set gccdir [file dirname $gccdir]
-    }
-    verbose "gccdir: $gccdir"
-
-    set ld_library_path "."
-    append ld_library_path ":${gccdir}"
-
-    set compiler "${gccdir}/xgcc"
-    if { [is_remote host] == 0 && [which $compiler] != 0 } {
-	foreach i "[exec $compiler --print-multi-lib]" {
-	    set mldir ""
-	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
-	    set mldir [string trimright $mldir "\;@"]
-	    if { "$mldir" == "." } {
-		continue
-	    }
-	    if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
-		append ld_library_path ":${gccdir}/${mldir}"
-	    }
-	}
-    }
-    # Add the library path for boehm-gc.
-    append ld_library_path ":${blddirgc}/.libs"
-
-    # Add the library path for boehm-gc.lib libtool libraries.
-    append ld_library_path ":.libs"
-
-    verbose "ld_library_path: $ld_library_path"
-
-    # Point to the headers in boehm-gc.
-    set gc_include "${blddirgc}/include"
-    verbose "gc_include: $gc_include"
-
-    set gc_lib "${blddirgc}/libgcjgc.la"
-    verbose "gc_lib: $gc_lib"
-
-    set gc_lib_conv "${blddirgc}/libgcjgc_convenience.la"
-    verbose "gc_lib_conv: $gc_lib_conv"
-
-    set_ld_library_path_env_vars
-    boehm-gc_maybe_build_wrapper "${objdir}/testglue.o"
-}
-
-proc boehm-gc_target_compile { source dest type options } {
-    global gluefile wrap_flags;
-    global srcdir
-    global TOOL_OPTIONS
-    global GCC_UNDER_TEST
-    global libtool
-    global gc_include
-    global gc_lib
-    global gc_lib_conv
-    global threadcflags
-    global threadlibs
-    global extra_test_libs
-
-    if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {
-	lappend options "libs=${gluefile}"
-	lappend options "ldflags=$wrap_flags"
-    }
-
-    # TOOL_OPTIONS must come first, so that it doesn't override testcase
-    # specific options.
-    if [info exists TOOL_OPTIONS] {
-	lappend options [concat "additional_flags=$TOOL_OPTIONS" $options];
-    }
-
-    # Map type to libtool mode.
-    switch $type {
-	"object" {
-	    set mode "compile"
-	}
-	"executable" {
-	    set mode "link"
-	}
-	default {
-	    perror "$type: unhandled type"
-	    return ""
-	}
-    }
-
-    # Set this once for reuse in boehm-gc.lib/lib.exp.
-    set libtool "../libtool"
-    # We have to run silently to avoid DejaGnu lossage.
-    lappend options "compiler=$libtool --silent --tag=CC --mode=$mode \
-    	$GCC_UNDER_TEST"
-
-    lappend options "additional_flags=-I${gc_include} -I${srcdir}/../include"
-    lappend options "additional_flags=${threadcflags}"
-
-    lappend options "libs=-Wc,-shared-libgcc"
-    
-    if { [file extension $dest] == ".la" } {
-	lappend options "libs=${gc_lib_conv}"
-    } else {
-	lappend options "libs=${gc_lib}"
-    }
-    lappend options "libs=${threadlibs} ${extra_test_libs}"
-
-    verbose "options: $options"
-    return [target_compile $source $dest $type $options]
-}
-
-# Prune harmless messages.
-proc boehm-gc-dg-prune { system text } {
-    # Prune the same messages as the gcc testsuite does.
-    set text [prune_gcc_output $text]
-
-    # Ignore harmless Darwin ranlib warnings.
-    regsub -all "(^|\n)(\[^\n\]*ranlib: file: \[^\n\]* has no symbols\n?)+" $text "\\1" text
-
-    return $text
-}
-
-# Build shared library from LIB.
-proc boehm-gc-build-shlib { lib flags extra-flags } {
-    global subdir
-    global dg-do-what-default
-    global libtool
-    global gc_lib_conv
-
-    # Determine basename.
-    set basename "[file rootname [file tail $lib]]"
-    verbose "basename: $basename"
-
-    # DejaGnu 1.4.4 doesn't support nested calls to dg-test.  Restore
-    # original state before calling it again.
-    if { [info procs dg-save-unknown] != [list] } {
-	rename unknown ""
-	rename dg-save-unknown unknown
-    }
-
-    set saved-dg-do-what ${dg-do-what-default}
-
-    # Compile $lib into libtool object.
-    set dg-do-what-default ltassemble
-    dg-test -keep-output $lib $flags ${extra-flags}
-
-    # FIXME: Explain options.
-    set shopt "-version-info 1:2:0 -no-undefined -rpath /nowhere"
-
-    # There's no way to get output_file out of dg-test, only
-    # ${tool}-dg-test returns it, so hardcode that here.
-    set dg-do-what-default link
-    dg-test -keep-output $basename.lo $flags "${extra-flags} $shopt"
-
-    set dg-do-what-default ${saved-dg-do-what}
-
-    # Restore unknown, dg-save-unknown as DejaGnu 1.4.4 dg-test expects them.
-    if { [info procs dg-save-unknown] == [list] } {
-    	rename unknown dg-save-unknown
-	proc unknown {} {
-	}
-    }
-
-    remote_exec host $libtool "--mode=clean rm -f $basename.lo"
-
-    return lib$basename.la
-}
-
-# Handle dg-add-shlib.
-proc dg-add-shlib { args } {
-    global tool
-    global srcdir subdir
-    global shlib
-
-    if { [llength $args] > 2 } {
-	error "[lindex $args 0]: too many arguments"
-	return
-    }
-
-    set lib [lindex $args 1]
-    set lib "$srcdir/$subdir/$lib"
-    verbose -log "dg-add-shlib $lib"
-
-    upvar tool_flags flags
-    upvar default_extra_tool_flags extra-flags
-    # Build support library.
-    set shlib [boehm-gc-build-shlib $lib $flags ${extra-flags}]
-
-    uplevel lappend tool_flags $shlib
-}
-
-# Run boehm-gc testcases.
-proc boehm-gc-dg-runtest { testcases flags extra-flags } {
-    global runtests
-    global libtool
-    global shlib
-
-    set shlib ""
-
-    foreach testcase $testcases {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $testcase] {
-	    return
-	}
-
-	# Run testcase.
-	# Keep output, otherwise libtool below won't remove the corresponding
-	# file in .libs.
-	dg-test -keep-output $testcase $flags ${extra-flags}
-
-	# Remove $execname and eventually $shlib.
-	remote_exec host $libtool "--mode=clean rm -f \
-		[file rootname [file tail $testcase]] $shlib"
-    }
-}
diff --git a/boehm-gc/threadlibs.c b/boehm-gc/threadlibs.c
deleted file mode 100644
index 69fcc5e90ab..00000000000
--- a/boehm-gc/threadlibs.c
+++ /dev/null
@@ -1,45 +0,0 @@
-# include "gc_config_macros.h"
-# include "private/gcconfig.h"
-# include <stdio.h>
-
-int main()
-{
-#   if defined(GC_USE_LD_WRAP)
-	printf("-Wl,--wrap -Wl,dlopen "
-	       "-Wl,--wrap -Wl,pthread_create -Wl,--wrap -Wl,pthread_join "
-	       "-Wl,--wrap -Wl,pthread_detach "
-	       "-Wl,--wrap -Wl,pthread_sigmask -Wl,--wrap -Wl,sleep\n");
-#   endif
-#   if defined(GC_LINUX_THREADS) || defined(GC_IRIX_THREADS) \
-	|| defined(GC_SOLARIS_PTHREADS) \
-	|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
-	|| defined(GC_GNU_THREADS)
-        printf("-lpthread\n");
-#   endif
-#   if defined(GC_FREEBSD_THREADS)
-#       if (__FREEBSD_version >= 500000)
-          printf("-lpthread\n");
-#       else
-          printf("-pthread\n");
-#       endif
-#   endif
-#   if defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS)
-	printf("-lpthread -lrt\n");
-#   endif
-#   if defined(GC_SOLARIS_THREADS) && !defined(GC_SOLARIS_PTHREADS)
-        printf("-lthread -ldl\n");
-#   endif
-#   if defined(GC_WIN32_THREADS) && defined(CYGWIN32)
-        printf("-lpthread\n");
-#   endif
-#   if defined(GC_OSF1_THREADS)
-	printf("-pthread -lrt"); /* DOB: must be -pthread, not -lpthread */
-#   endif
-    /* You need GCC 3.0.3 to build this one!           */  
-    /* DG/UX native gcc doesnt know what "-pthread" is */
-#   if defined(GC_DGUX386_THREADS)
-        printf("-ldl -pthread\n");
-#   endif
-    return 0;
-}
-
diff --git a/boehm-gc/threads.mk.in b/boehm-gc/threads.mk.in
deleted file mode 100644
index 31119df2018..00000000000
--- a/boehm-gc/threads.mk.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# to be used in libobjc for libobjc_gc
-
-thread_libs_and_flags = @THREADLIBS@ @extra_ldflags_libgc@
diff --git a/boehm-gc/typd_mlc.c b/boehm-gc/typd_mlc.c
deleted file mode 100644
index 373257cd260..00000000000
--- a/boehm-gc/typd_mlc.c
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- * opyright (c) 1999-2000 by Hewlett-Packard Company.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-
-
-/*
- * Some simple primitives for allocation with explicit type information.
- * Simple objects are allocated such that they contain a GC_descr at the
- * end (in the last allocated word).  This descriptor may be a procedure
- * which then examines an extended descriptor passed as its environment.
- *
- * Arrays are treated as simple objects if they have sufficiently simple
- * structure.  Otherwise they are allocated from an array kind that supplies
- * a special mark procedure.  These arrays contain a pointer to a
- * complex_descriptor as their last word.
- * This is done because the environment field is too small, and the collector
- * must trace the complex_descriptor.
- *
- * Note that descriptors inside objects may appear cleared, if we encounter a
- * false refrence to an object on a free list.  In the GC_descr case, this
- * is OK, since a 0 descriptor corresponds to examining no fields.
- * In the complex_descriptor case, we explicitly check for that case.
- *
- * MAJOR PARTS OF THIS CODE HAVE NOT BEEN TESTED AT ALL and are not testable,
- * since they are not accessible through the current interface.
- */
-
-#include "private/gc_pmark.h"
-#include "gc_typed.h"
-
-# define TYPD_EXTRA_BYTES (sizeof(word) - EXTRA_BYTES)
-
-GC_bool GC_explicit_typing_initialized = FALSE;
-
-int GC_explicit_kind;	/* Object kind for objects with indirect	*/
-			/* (possibly extended) descriptors.		*/
-
-int GC_array_kind;	/* Object kind for objects with complex		*/
-			/* descriptors and GC_array_mark_proc.		*/
-
-/* Extended descriptors.  GC_typed_mark_proc understands these.	*/
-/* These are used for simple objects that are larger than what	*/
-/* can be described by a BITMAP_BITS sized bitmap.		*/
-typedef struct {
-	word ed_bitmap;	/* lsb corresponds to first word.	*/
-	GC_bool ed_continued;	/* next entry is continuation.	*/
-} ext_descr;
-
-/* Array descriptors.  GC_array_mark_proc understands these.	*/
-/* We may eventually need to add provisions for headers and	*/
-/* trailers.  Hence we provide for tree structured descriptors, */
-/* though we don't really use them currently.			*/
-typedef union ComplexDescriptor {
-    struct LeafDescriptor {	/* Describes simple array	*/
-        word ld_tag;
-#	define LEAF_TAG 1
-	word ld_size;		/* bytes per element	*/
-				/* multiple of ALIGNMENT	*/
-	word ld_nelements;	/* Number of elements.	*/
-	GC_descr ld_descriptor; /* A simple length, bitmap,	*/
-				/* or procedure descriptor.	*/
-    } ld;
-    struct ComplexArrayDescriptor {
-        word ad_tag;
-#	define ARRAY_TAG 2
-	word ad_nelements;
-	union ComplexDescriptor * ad_element_descr;
-    } ad;
-    struct SequenceDescriptor {
-        word sd_tag;
-#	define SEQUENCE_TAG 3
-	union ComplexDescriptor * sd_first;
-	union ComplexDescriptor * sd_second;
-    } sd;
-} complex_descriptor;
-#define TAG ld.ld_tag
-
-ext_descr * GC_ext_descriptors;	/* Points to array of extended 	*/
-				/* descriptors.			*/
-
-word GC_ed_size = 0;	/* Current size of above arrays.	*/
-# define ED_INITIAL_SIZE 100;
-
-word GC_avail_descr = 0;	/* Next available slot.		*/
-
-int GC_typed_mark_proc_index;	/* Indices of my mark		*/
-int GC_array_mark_proc_index;	/* procedures.			*/
-
-/* Add a multiword bitmap to GC_ext_descriptors arrays.  Return	*/
-/* starting index.						*/
-/* Returns -1 on failure.					*/
-/* Caller does not hold allocation lock.			*/
-signed_word GC_add_ext_descriptor(bm, nbits)
-GC_bitmap bm;
-word nbits;
-{
-    register size_t nwords = divWORDSZ(nbits + WORDSZ-1);
-    register signed_word result;
-    register word i;
-    register word last_part;
-    register int extra_bits;
-    DCL_LOCK_STATE;
-
-    DISABLE_SIGNALS();
-    LOCK();
-    while (GC_avail_descr + nwords >= GC_ed_size) {
-    	ext_descr * new;
-    	size_t new_size;
-    	word ed_size = GC_ed_size;
-    	
-    	UNLOCK();
-        ENABLE_SIGNALS();
-    	if (ed_size == 0) {
-    	    new_size = ED_INITIAL_SIZE;
-    	} else {
-    	    new_size = 2 * ed_size;
-    	    if (new_size > MAX_ENV) return(-1);
-    	} 
-    	new = (ext_descr *) GC_malloc_atomic(new_size * sizeof(ext_descr));
-    	if (new == 0) return(-1);
-    	DISABLE_SIGNALS();
-        LOCK();
-        if (ed_size == GC_ed_size) {
-            if (GC_avail_descr != 0) {
-    	        BCOPY(GC_ext_descriptors, new,
-    	              GC_avail_descr * sizeof(ext_descr));
-    	    }
-    	    GC_ed_size = new_size;
-    	    GC_ext_descriptors = new;
-    	}  /* else another thread already resized it in the meantime */
-    }
-    result = GC_avail_descr;
-    for (i = 0; i < nwords-1; i++) {
-        GC_ext_descriptors[result + i].ed_bitmap = bm[i];
-        GC_ext_descriptors[result + i].ed_continued = TRUE;
-    }
-    last_part = bm[i];
-    /* Clear irrelevant bits. */
-    extra_bits = nwords * WORDSZ - nbits;
-    last_part <<= extra_bits;
-    last_part >>= extra_bits;
-    GC_ext_descriptors[result + i].ed_bitmap = last_part;
-    GC_ext_descriptors[result + i].ed_continued = FALSE;
-    GC_avail_descr += nwords;
-    UNLOCK();
-    ENABLE_SIGNALS();
-    return(result);
-}
-
-/* Table of bitmap descriptors for n word long all pointer objects.	*/
-GC_descr GC_bm_table[WORDSZ/2];
-	
-/* Return a descriptor for the concatenation of 2 nwords long objects,	*/
-/* each of which is described by descriptor.				*/
-/* The result is known to be short enough to fit into a bitmap		*/
-/* descriptor.								*/
-/* Descriptor is a GC_DS_LENGTH or GC_DS_BITMAP descriptor.		*/
-GC_descr GC_double_descr(descriptor, nwords)
-register GC_descr descriptor;
-register word nwords;
-{
-    if ((descriptor & GC_DS_TAGS) == GC_DS_LENGTH) {
-        descriptor = GC_bm_table[BYTES_TO_WORDS((word)descriptor)];
-    };
-    descriptor |= (descriptor & ~GC_DS_TAGS) >> nwords;
-    return(descriptor);
-}
-
-complex_descriptor * GC_make_sequence_descriptor();
-
-/* Build a descriptor for an array with nelements elements,	*/
-/* each of which can be described by a simple descriptor.	*/
-/* We try to optimize some common cases.			*/
-/* If the result is COMPLEX, then a complex_descr* is returned  */
-/* in *complex_d.							*/
-/* If the result is LEAF, then we built a LeafDescriptor in	*/
-/* the structure pointed to by leaf.				*/
-/* The tag in the leaf structure is not set.			*/
-/* If the result is SIMPLE, then a GC_descr			*/
-/* is returned in *simple_d.					*/
-/* If the result is NO_MEM, then				*/
-/* we failed to allocate the descriptor.			*/
-/* The implementation knows that GC_DS_LENGTH is 0.		*/
-/* *leaf, *complex_d, and *simple_d may be used as temporaries	*/
-/* during the construction.					*/
-# define COMPLEX 2
-# define LEAF 1
-# define SIMPLE 0
-# define NO_MEM (-1)
-int GC_make_array_descriptor(nelements, size, descriptor,
-			     simple_d, complex_d, leaf)
-word size;
-word nelements;
-GC_descr descriptor;
-GC_descr *simple_d;
-complex_descriptor **complex_d;
-struct LeafDescriptor * leaf;
-{
-#   define OPT_THRESHOLD 50
-	/* For larger arrays, we try to combine descriptors of adjacent	*/
-	/* descriptors to speed up marking, and to reduce the amount	*/
-	/* of space needed on the mark stack.				*/
-    if ((descriptor & GC_DS_TAGS) == GC_DS_LENGTH) {
-      if ((word)descriptor == size) {
-    	*simple_d = nelements * descriptor;
-    	return(SIMPLE);
-      } else if ((word)descriptor == 0) {
-        *simple_d = (GC_descr)0;
-        return(SIMPLE);
-      }
-    }
-    if (nelements <= OPT_THRESHOLD) {
-      if (nelements <= 1) {
-        if (nelements == 1) {
-            *simple_d = descriptor;
-            return(SIMPLE);
-        } else {
-            *simple_d = (GC_descr)0;
-            return(SIMPLE);
-        }
-      }
-    } else if (size <= BITMAP_BITS/2
-    	       && (descriptor & GC_DS_TAGS) != GC_DS_PROC
-    	       && (size & (sizeof(word)-1)) == 0) {
-      int result =      
-          GC_make_array_descriptor(nelements/2, 2*size,
-      				   GC_double_descr(descriptor,
-      				   		   BYTES_TO_WORDS(size)),
-      				   simple_d, complex_d, leaf);
-      if ((nelements & 1) == 0) {
-          return(result);
-      } else {
-          struct LeafDescriptor * one_element =
-              (struct LeafDescriptor *)
-        	GC_malloc_atomic(sizeof(struct LeafDescriptor));
-          
-          if (result == NO_MEM || one_element == 0) return(NO_MEM);
-          one_element -> ld_tag = LEAF_TAG;
-          one_element -> ld_size = size;
-          one_element -> ld_nelements = 1;
-          one_element -> ld_descriptor = descriptor;
-          switch(result) {
-            case SIMPLE:
-            {
-              struct LeafDescriptor * beginning =
-                (struct LeafDescriptor *)
-        	  GC_malloc_atomic(sizeof(struct LeafDescriptor));
-              if (beginning == 0) return(NO_MEM);
-              beginning -> ld_tag = LEAF_TAG;
-              beginning -> ld_size = size;
-              beginning -> ld_nelements = 1;
-              beginning -> ld_descriptor = *simple_d;
-              *complex_d = GC_make_sequence_descriptor(
-              			(complex_descriptor *)beginning,
-              			(complex_descriptor *)one_element);
-              break;
-            }
-            case LEAF:
-            {
-              struct LeafDescriptor * beginning =
-                (struct LeafDescriptor *)
-        	  GC_malloc_atomic(sizeof(struct LeafDescriptor));
-              if (beginning == 0) return(NO_MEM);
-              beginning -> ld_tag = LEAF_TAG;
-              beginning -> ld_size = leaf -> ld_size;
-              beginning -> ld_nelements = leaf -> ld_nelements;
-              beginning -> ld_descriptor = leaf -> ld_descriptor;
-              *complex_d = GC_make_sequence_descriptor(
-              			(complex_descriptor *)beginning,
-              			(complex_descriptor *)one_element);
-              break;
-            }
-            case COMPLEX:
-              *complex_d = GC_make_sequence_descriptor(
-              			*complex_d,
-              			(complex_descriptor *)one_element);
-              break;
-          }
-          return(COMPLEX);
-      }
-    }
-    {
-        leaf -> ld_size = size;
-        leaf -> ld_nelements = nelements;
-        leaf -> ld_descriptor = descriptor;
-        return(LEAF);
-    }
-}
-
-complex_descriptor * GC_make_sequence_descriptor(first, second)
-complex_descriptor * first;
-complex_descriptor * second;
-{
-    struct SequenceDescriptor * result =
-        (struct SequenceDescriptor *)
-        	GC_malloc(sizeof(struct SequenceDescriptor));
-    /* Can't result in overly conservative marking, since tags are	*/
-    /* very small integers. Probably faster than maintaining type	*/
-    /* info.								*/    
-    if (result != 0) {
-    	result -> sd_tag = SEQUENCE_TAG;
-        result -> sd_first = first;
-        result -> sd_second = second;
-    }
-    return((complex_descriptor *)result);
-}
-
-#ifdef UNDEFINED
-complex_descriptor * GC_make_complex_array_descriptor(nelements, descr)
-word nelements;
-complex_descriptor * descr;
-{
-    struct ComplexArrayDescriptor * result =
-        (struct ComplexArrayDescriptor *)
-        	GC_malloc(sizeof(struct ComplexArrayDescriptor));
-    
-    if (result != 0) {
-    	result -> ad_tag = ARRAY_TAG;
-        result -> ad_nelements = nelements;
-        result -> ad_element_descr = descr;
-    }
-    return((complex_descriptor *)result);
-}
-#endif
-
-ptr_t * GC_eobjfreelist;
-
-ptr_t * GC_arobjfreelist;
-
-mse * GC_typed_mark_proc GC_PROTO((register word * addr,
-				   register mse * mark_stack_ptr,
-				   mse * mark_stack_limit,
-				   word env));
-
-mse * GC_array_mark_proc GC_PROTO((register word * addr,
-				   register mse * mark_stack_ptr,
-				   mse * mark_stack_limit,
-				   word env));
-
-/* Caller does not hold allocation lock. */
-void GC_init_explicit_typing()
-{
-    register int i;
-    DCL_LOCK_STATE;
-
-    
-#   ifdef PRINTSTATS
-     	if (sizeof(struct LeafDescriptor) % sizeof(word) != 0)
-     	    ABORT("Bad leaf descriptor size");
-#   endif
-    DISABLE_SIGNALS();
-    LOCK();
-    if (GC_explicit_typing_initialized) {
-      UNLOCK();
-      ENABLE_SIGNALS();
-      return;
-    }
-    GC_explicit_typing_initialized = TRUE;
-    /* Set up object kind with simple indirect descriptor. */
-      GC_eobjfreelist = (ptr_t *)GC_new_free_list_inner();
-      GC_explicit_kind = GC_new_kind_inner(
-		      	    (void **)GC_eobjfreelist,
-		      	    (((word)WORDS_TO_BYTES(-1)) | GC_DS_PER_OBJECT),
-			    TRUE, TRUE);
-    		/* Descriptors are in the last word of the object. */
-      GC_typed_mark_proc_index = GC_new_proc_inner(GC_typed_mark_proc);
-    /* Set up object kind with array descriptor. */
-      GC_arobjfreelist = (ptr_t *)GC_new_free_list_inner();
-      GC_array_mark_proc_index = GC_new_proc_inner(GC_array_mark_proc);
-      GC_array_kind = GC_new_kind_inner(
-		      	    (void **)GC_arobjfreelist,
-			    GC_MAKE_PROC(GC_array_mark_proc_index, 0),
-			    FALSE, TRUE);
-      for (i = 0; i < WORDSZ/2; i++) {
-          GC_descr d = (((word)(-1)) >> (WORDSZ - i)) << (WORDSZ - i);
-          d |= GC_DS_BITMAP;
-          GC_bm_table[i] = d;
-      }
-    UNLOCK();
-    ENABLE_SIGNALS();
-}
-
-# if defined(__STDC__) || defined(__cplusplus)
-    mse * GC_typed_mark_proc(register word * addr,
-			     register mse * mark_stack_ptr,
-			     mse * mark_stack_limit,
-			     word env)
-# else
-    mse * GC_typed_mark_proc(addr, mark_stack_ptr, mark_stack_limit, env)
-    register word * addr;
-    register mse * mark_stack_ptr;
-    mse * mark_stack_limit;
-    word env;
-# endif
-{
-    register word bm = GC_ext_descriptors[env].ed_bitmap;
-    register word * current_p = addr;
-    register word current;
-    register ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
-    register ptr_t least_ha = GC_least_plausible_heap_addr;
-    
-    for (; bm != 0; bm >>= 1, current_p++) {
-    	if (bm & 1) {
-    	    current = *current_p;
-	    FIXUP_POINTER(current);
-    	    if ((ptr_t)current >= least_ha && (ptr_t)current <= greatest_ha) {
-    	        PUSH_CONTENTS((ptr_t)current, mark_stack_ptr,
-			      mark_stack_limit, current_p, exit1);
-    	    }
-    	}
-    }
-    if (GC_ext_descriptors[env].ed_continued) {
-        /* Push an entry with the rest of the descriptor back onto the	*/
-        /* stack.  Thus we never do too much work at once.  Note that	*/
-        /* we also can't overflow the mark stack unless we actually 	*/
-        /* mark something.						*/
-        mark_stack_ptr++;
-        if (mark_stack_ptr >= mark_stack_limit) {
-            mark_stack_ptr = GC_signal_mark_stack_overflow(mark_stack_ptr);
-        }
-        mark_stack_ptr -> mse_start = addr + WORDSZ;
-        mark_stack_ptr -> mse_descr =
-        	GC_MAKE_PROC(GC_typed_mark_proc_index, env+1);
-    }
-    return(mark_stack_ptr);
-}
-
-/* Return the size of the object described by d.  It would be faster to	*/
-/* store this directly, or to compute it as part of			*/
-/* GC_push_complex_descriptor, but hopefully it doesn't matter.		*/
-word GC_descr_obj_size(d)
-register complex_descriptor *d;
-{
-    switch(d -> TAG) {
-      case LEAF_TAG:
-      	return(d -> ld.ld_nelements * d -> ld.ld_size);
-      case ARRAY_TAG:
-        return(d -> ad.ad_nelements
-               * GC_descr_obj_size(d -> ad.ad_element_descr));
-      case SEQUENCE_TAG:
-        return(GC_descr_obj_size(d -> sd.sd_first)
-               + GC_descr_obj_size(d -> sd.sd_second));
-      default:
-        ABORT("Bad complex descriptor");
-        /*NOTREACHED*/ return 0; /*NOTREACHED*/
-    }
-}
-
-/* Push descriptors for the object at addr with complex descriptor d	*/
-/* onto the mark stack.  Return 0 if the mark stack overflowed.  	*/
-mse * GC_push_complex_descriptor(addr, d, msp, msl)
-word * addr;
-register complex_descriptor *d;
-register mse * msp;
-mse * msl;
-{
-    register ptr_t current = (ptr_t) addr;
-    register word nelements;
-    register word sz;
-    register word i;
-    
-    switch(d -> TAG) {
-      case LEAF_TAG:
-        {
-          register GC_descr descr = d -> ld.ld_descriptor;
-          
-          nelements = d -> ld.ld_nelements;
-          if (msl - msp <= (ptrdiff_t)nelements) return(0);
-          sz = d -> ld.ld_size;
-          for (i = 0; i < nelements; i++) {
-              msp++;
-              msp -> mse_start = (word *)current;
-              msp -> mse_descr = descr;
-              current += sz;
-          }
-          return(msp);
-        }
-      case ARRAY_TAG:
-        {
-          register complex_descriptor *descr = d -> ad.ad_element_descr;
-          
-          nelements = d -> ad.ad_nelements;
-          sz = GC_descr_obj_size(descr);
-          for (i = 0; i < nelements; i++) {
-              msp = GC_push_complex_descriptor((word *)current, descr,
-              					msp, msl);
-              if (msp == 0) return(0);
-              current += sz;
-          }
-          return(msp);
-        }
-      case SEQUENCE_TAG:
-        {
-          sz = GC_descr_obj_size(d -> sd.sd_first);
-          msp = GC_push_complex_descriptor((word *)current, d -> sd.sd_first,
-          				   msp, msl);
-          if (msp == 0) return(0);
-          current += sz;
-          msp = GC_push_complex_descriptor((word *)current, d -> sd.sd_second,
-          				   msp, msl);
-          return(msp);
-        }
-      default:
-        ABORT("Bad complex descriptor");
-        /*NOTREACHED*/ return 0; /*NOTREACHED*/
-   }
-}
-
-/*ARGSUSED*/
-# if defined(__STDC__) || defined(__cplusplus)
-    mse * GC_array_mark_proc(register word * addr,
-			     register mse * mark_stack_ptr,
-			     mse * mark_stack_limit,
-			     word env)
-# else
-    mse * GC_array_mark_proc(addr, mark_stack_ptr, mark_stack_limit, env)
-    register word * addr;
-    register mse * mark_stack_ptr;
-    mse * mark_stack_limit;
-    word env;
-# endif
-{
-    register hdr * hhdr = HDR(addr);
-    register word sz = hhdr -> hb_sz;
-    register complex_descriptor * descr = (complex_descriptor *)(addr[sz-1]);
-    mse * orig_mark_stack_ptr = mark_stack_ptr;
-    mse * new_mark_stack_ptr;
-    
-    if (descr == 0) {
-    	/* Found a reference to a free list entry.  Ignore it. */
-    	return(orig_mark_stack_ptr);
-    }
-    /* In use counts were already updated when array descriptor was	*/
-    /* pushed.  Here we only replace it by subobject descriptors, so 	*/
-    /* no update is necessary.						*/
-    new_mark_stack_ptr = GC_push_complex_descriptor(addr, descr,
-    						    mark_stack_ptr,
-    						    mark_stack_limit-1);
-    if (new_mark_stack_ptr == 0) {
-    	/* Doesn't fit.  Conservatively push the whole array as a unit	*/
-    	/* and request a mark stack expansion.				*/
-    	/* This cannot cause a mark stack overflow, since it replaces	*/
-    	/* the original array entry.					*/
-    	GC_mark_stack_too_small = TRUE;
-    	new_mark_stack_ptr = orig_mark_stack_ptr + 1;
-    	new_mark_stack_ptr -> mse_start = addr;
-    	new_mark_stack_ptr -> mse_descr = WORDS_TO_BYTES(sz) | GC_DS_LENGTH;
-    } else {
-        /* Push descriptor itself */
-        new_mark_stack_ptr++;
-        new_mark_stack_ptr -> mse_start = addr + sz - 1;
-        new_mark_stack_ptr -> mse_descr = sizeof(word) | GC_DS_LENGTH;
-    }
-    return(new_mark_stack_ptr);
-}
-
-#if defined(__STDC__) || defined(__cplusplus)
-  GC_descr GC_make_descriptor(GC_bitmap bm, size_t len)
-#else
-  GC_descr GC_make_descriptor(bm, len)
-  GC_bitmap bm;
-  size_t len;
-#endif
-{
-    register signed_word last_set_bit = len - 1;
-    register word result;
-    register int i;
-#   define HIGH_BIT (((word)1) << (WORDSZ - 1))
-    
-    if (!GC_explicit_typing_initialized) GC_init_explicit_typing();
-    while (last_set_bit >= 0 && !GC_get_bit(bm, last_set_bit)) last_set_bit --;
-    if (last_set_bit < 0) return(0 /* no pointers */);
-#   if ALIGNMENT == CPP_WORDSZ/8
-    {
-      register GC_bool all_bits_set = TRUE;
-      for (i = 0; i < last_set_bit; i++) {
-    	if (!GC_get_bit(bm, i)) {
-    	    all_bits_set = FALSE;
-    	    break;
-    	}
-      }
-      if (all_bits_set) {
-    	/* An initial section contains all pointers.  Use length descriptor. */
-        return(WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH);
-      }
-    }
-#   endif
-    if (last_set_bit < BITMAP_BITS) {
-    	/* Hopefully the common case.			*/
-    	/* Build bitmap descriptor (with bits reversed)	*/
-    	result = HIGH_BIT;
-    	for (i = last_set_bit - 1; i >= 0; i--) {
-    	    result >>= 1;
-    	    if (GC_get_bit(bm, i)) result |= HIGH_BIT;
-    	}
-    	result |= GC_DS_BITMAP;
-    	return(result);
-    } else {
-    	signed_word index;
-    	
-    	index = GC_add_ext_descriptor(bm, (word)last_set_bit+1);
-    	if (index == -1) return(WORDS_TO_BYTES(last_set_bit+1) | GC_DS_LENGTH);
-    				/* Out of memory: use conservative	*/
-    				/* approximation.			*/
-    	result = GC_MAKE_PROC(GC_typed_mark_proc_index, (word)index);
-    	return(result);
-    }
-}
-
-ptr_t GC_clear_stack();
-
-#define GENERAL_MALLOC(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc((word)lb, k))
-    
-#define GENERAL_MALLOC_IOP(lb,k) \
-    (GC_PTR)GC_clear_stack(GC_generic_malloc_ignore_off_page(lb, k))
-
-#if defined(__STDC__) || defined(__cplusplus)
-  void * GC_malloc_explicitly_typed(size_t lb, GC_descr d)
-#else
-  char * GC_malloc_explicitly_typed(lb, d)
-  size_t lb;
-  GC_descr d;
-#endif
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    lb += TYPD_EXTRA_BYTES;
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_eobjfreelist[lw]);
-	FASTLOCK();
-        if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {
-            FASTUNLOCK();
-            op = (ptr_t)GENERAL_MALLOC((word)lb, GC_explicit_kind);
-	    if (0 == op) return 0;
-#	    ifdef MERGE_SIZES
-		lw = GC_size_map[lb];	/* May have been uninitialized.	*/
-#	    endif
-        } else {
-            *opp = obj_link(op);
-	    obj_link(op) = 0;
-            GC_words_allocd += lw;
-            FASTUNLOCK();
-        }
-   } else {
-       op = (ptr_t)GENERAL_MALLOC((word)lb, GC_explicit_kind);
-       if (op != NULL)
-	    lw = BYTES_TO_WORDS(GC_size(op));
-   }
-   if (op != NULL)
-       ((word *)op)[lw - 1] = d;
-   return((GC_PTR) op);
-}
-
-#if defined(__STDC__) || defined(__cplusplus)
-  void * GC_malloc_explicitly_typed_ignore_off_page(size_t lb, GC_descr d)
-#else
-  char * GC_malloc_explicitly_typed_ignore_off_page(lb, d)
-  size_t lb;
-  GC_descr d;
-#endif
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-DCL_LOCK_STATE;
-
-    lb += TYPD_EXTRA_BYTES;
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_eobjfreelist[lw]);
-	FASTLOCK();
-        if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {
-            FASTUNLOCK();
-            op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind);
-#	    ifdef MERGE_SIZES
-		lw = GC_size_map[lb];	/* May have been uninitialized.	*/
-#	    endif
-        } else {
-            *opp = obj_link(op);
-	    obj_link(op) = 0;
-            GC_words_allocd += lw;
-            FASTUNLOCK();
-        }
-   } else {
-       op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind);
-       if (op != NULL)
-       lw = BYTES_TO_WORDS(GC_size(op));
-   }
-   if (op != NULL)
-       ((word *)op)[lw - 1] = d;
-   return((GC_PTR) op);
-}
-
-#if defined(__STDC__) || defined(__cplusplus)
-  void * GC_calloc_explicitly_typed(size_t n,
-  				    size_t lb,
-  				    GC_descr d)
-#else
-  char * GC_calloc_explicitly_typed(n, lb, d)
-  size_t n;
-  size_t lb;
-  GC_descr d;
-#endif
-{
-register ptr_t op;
-register ptr_t * opp;
-register word lw;
-GC_descr simple_descr;
-complex_descriptor *complex_descr;
-register int descr_type;
-struct LeafDescriptor leaf;
-DCL_LOCK_STATE;
-
-    descr_type = GC_make_array_descriptor((word)n, (word)lb, d,
-    					  &simple_descr, &complex_descr, &leaf);
-    switch(descr_type) {
-    	case NO_MEM: return(0);
-    	case SIMPLE: return(GC_malloc_explicitly_typed(n*lb, simple_descr));
-    	case LEAF:
-    	    lb *= n;
-    	    lb += sizeof(struct LeafDescriptor) + TYPD_EXTRA_BYTES;
-    	    break;
-    	case COMPLEX:
-    	    lb *= n;
-    	    lb += TYPD_EXTRA_BYTES;
-    	    break;
-    }
-    if( SMALL_OBJ(lb) ) {
-#       ifdef MERGE_SIZES
-	  lw = GC_size_map[lb];
-#	else
-	  lw = ALIGNED_WORDS(lb);
-#       endif
-	opp = &(GC_arobjfreelist[lw]);
-	FASTLOCK();
-        if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) {
-            FASTUNLOCK();
-            op = (ptr_t)GENERAL_MALLOC((word)lb, GC_array_kind);
-	    if (0 == op) return(0);
-#	    ifdef MERGE_SIZES
-		lw = GC_size_map[lb];	/* May have been uninitialized.	*/            
-#	    endif
-        } else {
-            *opp = obj_link(op);
-	    obj_link(op) = 0;
-            GC_words_allocd += lw;
-            FASTUNLOCK();
-        }
-   } else {
-       op = (ptr_t)GENERAL_MALLOC((word)lb, GC_array_kind);
-       if (0 == op) return(0);
-       lw = BYTES_TO_WORDS(GC_size(op));
-   }
-   if (descr_type == LEAF) {
-       /* Set up the descriptor inside the object itself. */
-       VOLATILE struct LeafDescriptor * lp =
-           (struct LeafDescriptor *)
-               ((word *)op
-                + lw - (BYTES_TO_WORDS(sizeof(struct LeafDescriptor)) + 1));
-                
-       lp -> ld_tag = LEAF_TAG;
-       lp -> ld_size = leaf.ld_size;
-       lp -> ld_nelements = leaf.ld_nelements;
-       lp -> ld_descriptor = leaf.ld_descriptor;
-       ((VOLATILE word *)op)[lw - 1] = (word)lp;
-   } else {
-       extern unsigned GC_finalization_failures;
-       unsigned ff = GC_finalization_failures;
-       
-       ((word *)op)[lw - 1] = (word)complex_descr;
-       /* Make sure the descriptor is cleared once there is any danger	*/
-       /* it may have been collected.					*/
-       (void)
-         GC_general_register_disappearing_link((GC_PTR *)
-         					  ((word *)op+lw-1),
-       					          (GC_PTR) op);
-       if (ff != GC_finalization_failures) {
-	   /* Couldn't register it due to lack of memory.  Punt.	*/
-	   /* This will probably fail too, but gives the recovery code  */
-	   /* a chance.							*/
-	   return(GC_malloc(n*lb));
-       }			          
-   }
-   return((GC_PTR) op);
-}
diff --git a/boehm-gc/version.h b/boehm-gc/version.h
deleted file mode 100644
index 9fcbb7b651f..00000000000
--- a/boehm-gc/version.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* The version here should match that in configure/configure.ac	*/
-/* Eventually this one may become unnecessary.  For now we need	*/
-/* it to keep the old-style build process working.		*/
-#define GC_TMP_VERSION_MAJOR 6
-#define GC_TMP_VERSION_MINOR 6
-#define GC_TMP_ALPHA_VERSION GC_NOT_ALPHA
-
-#ifndef GC_NOT_ALPHA
-#   define GC_NOT_ALPHA 0xff
-#endif
-
-#if defined(GC_VERSION_MAJOR)
-# if GC_TMP_VERSION_MAJOR != GC_VERSION_MAJOR || \
-     GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
-     defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
-     defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
-#   error Inconsistent version info.  Check README, version.h, and configure.ac.
-# endif
-#else
-# define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
-# define GC_VERSION_MINOR GC_TMP_VERSION_MINOR
-# define GC_ALPHA_VERSION GC_TMP_ALPHA_VERSION
-#endif
-
-
-#ifndef GC_NO_VERSION_VAR
-
-unsigned GC_version = ((GC_VERSION_MAJOR << 16) | (GC_VERSION_MINOR << 8) | GC_TMP_ALPHA_VERSION);
-
-#endif /* GC_NO_VERSION_VAR */ 
diff --git a/boehm-gc/win32_threads.c b/boehm-gc/win32_threads.c
deleted file mode 100644
index 2de1c6953b8..00000000000
--- a/boehm-gc/win32_threads.c
+++ /dev/null
@@ -1,819 +0,0 @@
-#include "private/gc_priv.h"
-
-#if defined(GC_WIN32_THREADS) 
-
-#include <windows.h>
-
-#ifdef CYGWIN32
-# include <errno.h>
-
- /* Cygwin-specific forward decls */
-# undef pthread_create 
-# undef pthread_sigmask 
-# undef pthread_join 
-# undef pthread_detach
-# undef dlopen 
-
-# define DEBUG_CYGWIN_THREADS 0
-
-  void * GC_start_routine(void * arg);
-  void GC_thread_exit_proc(void *arg);
-
-#endif
-
-/* The type of the first argument to InterlockedExchange.	*/
-/* Documented to be LONG volatile *, but at least gcc likes 	*/
-/* this better.							*/
-typedef LONG * IE_t;
-
-#ifndef MAX_THREADS
-# define MAX_THREADS 256
-    /* FIXME:							*/
-    /* Things may get quite slow for large numbers of threads,	*/
-    /* since we look them up with sequential search.		*/
-#endif
-
-GC_bool GC_thr_initialized = FALSE;
-
-DWORD GC_main_thread = 0;
-
-struct GC_thread_Rep {
-  LONG in_use; /* Updated without lock.	*/
-  			/* We assert that unused 	*/
-  			/* entries have invalid ids of	*/
-  			/* zero and zero stack fields.  */
-  DWORD id;
-  HANDLE handle;
-  ptr_t stack_base;	/* The cold end of the stack.   */
-			/* 0 ==> entry not valid.	*/
-			/* !in_use ==> stack_base == 0	*/
-  GC_bool suspended;
-
-# ifdef CYGWIN32
-    void *status; /* hold exit value until join in case it's a pointer */
-    pthread_t pthread_id;
-    short flags;		/* Protected by GC lock.	*/
-#	define FINISHED 1   	/* Thread has exited.	*/
-#	define DETACHED 2	/* Thread is intended to be detached.	*/
-# endif
-};
-
-typedef volatile struct GC_thread_Rep * GC_thread;
-
-/*
- * We generally assume that volatile ==> memory ordering, at least among
- * volatiles.
- */
-
-volatile GC_bool GC_please_stop = FALSE;
-
-volatile struct GC_thread_Rep thread_table[MAX_THREADS];
-
-volatile LONG GC_max_thread_index = 0; /* Largest index in thread_table	*/
-				       /* that was ever used.		*/
-
-extern LONG WINAPI GC_write_fault_handler(struct _EXCEPTION_POINTERS *exc_info);
-
-/*
- * This may be called from DllMain, and hence operates under unusual
- * constraints.
- */
-static GC_thread GC_new_thread(void) {
-  int i;
-  /* It appears to be unsafe to acquire a lock here, since this	*/
-  /* code is apparently not preeemptible on some systems.	*/
-  /* (This is based on complaints, not on Microsoft's official	*/
-  /* documentation, which says this should perform "only simple	*/
-  /* initialization tasks".)					*/
-  /* Hence we make do with nonblocking synchronization.		*/
-
-  /* The following should be a noop according to the win32	*/
-  /* documentation.  There is empirical evidence that it	*/
-  /* isn't.		- HB					*/
-# if defined(MPROTECT_VDB)
-   if (GC_incremental) SetUnhandledExceptionFilter(GC_write_fault_handler);
-# endif
-                /* cast away volatile qualifier */
-  for (i = 0; InterlockedExchange((IE_t)&thread_table[i].in_use,1) != 0; i++) {
-    /* Compare-and-swap would make this cleaner, but that's not 	*/
-    /* supported before Windows 98 and NT 4.0.  In Windows 2000,	*/
-    /* InterlockedExchange is supposed to be replaced by		*/
-    /* InterlockedExchangePointer, but that's not really what I		*/
-    /* want here.							*/
-    if (i == MAX_THREADS - 1)
-      ABORT("too many threads");
-  }
-  /* Update GC_max_thread_index if necessary.  The following is safe,	*/
-  /* and unlike CompareExchange-based solutions seems to work on all	*/
-  /* Windows95 and later platforms.					*/
-  /* Unfortunately, GC_max_thread_index may be temporarily out of 	*/
-  /* bounds, so readers have to compensate.				*/
-  while (i > GC_max_thread_index) {
-    InterlockedIncrement((IE_t)&GC_max_thread_index);
-  }
-  if (GC_max_thread_index >= MAX_THREADS) {
-    /* We overshot due to simultaneous increments.	*/
-    /* Setting it to MAX_THREADS-1 is always safe.	*/
-    GC_max_thread_index = MAX_THREADS - 1;
-  }
-  
-# ifdef CYGWIN32
-    thread_table[i].pthread_id = pthread_self();
-# endif
-  if (!DuplicateHandle(GetCurrentProcess(),
-	               GetCurrentThread(),
-		       GetCurrentProcess(),
-		       (HANDLE*)&thread_table[i].handle,
-		       0,
-		       0,
-		       DUPLICATE_SAME_ACCESS)) {
-	DWORD last_error = GetLastError();
-	GC_printf1("Last error code: %lx\n", last_error);
-	ABORT("DuplicateHandle failed");
-  }
-  thread_table[i].stack_base = GC_get_stack_base();
-  /* Up until this point, GC_push_all_stacks considers this thread	*/
-  /* invalid.								*/
-  if (thread_table[i].stack_base == NULL) 
-    ABORT("Failed to find stack base in GC_new_thread");
-  /* Up until this point, this entry is viewed as reserved but invalid	*/
-  /* by GC_delete_thread.						*/
-  thread_table[i].id = GetCurrentThreadId();
-  /* If this thread is being created while we are trying to stop	*/
-  /* the world, wait here.  Hopefully this can't happen on any	*/
-  /* systems that don't allow us to block here.			*/
-  while (GC_please_stop) Sleep(20);
-  return thread_table + i;
-}
-
-/*
- * GC_max_thread_index may temporarily be larger than MAX_THREADS.
- * To avoid subscript errors, we check on access.
- */
-#ifdef __GNUC__
-__inline__
-#endif
-LONG GC_get_max_thread_index()
-{
-  LONG my_max = GC_max_thread_index;
-
-  if (my_max >= MAX_THREADS) return MAX_THREADS-1;
-  return my_max;
-}
-
-/* This is intended to be lock-free, though that			*/
-/* assumes that the CloseHandle becomes visible before the 		*/
-/* in_use assignment.							*/
-static void GC_delete_gc_thread(GC_thread thr)
-{
-    CloseHandle(thr->handle);
-      /* cast away volatile qualifier */
-    thr->stack_base = 0;
-    thr->id = 0;
-#   ifdef CYGWIN32
-      thr->pthread_id = 0;
-#   endif /* CYGWIN32 */
-    thr->in_use = FALSE;
-}
-
-static void GC_delete_thread(DWORD thread_id) {
-  int i;
-  LONG my_max = GC_get_max_thread_index();
-
-  for (i = 0;
-       i <= my_max &&
-       (!thread_table[i].in_use || thread_table[i].id != thread_id);
-       /* Must still be in_use, since nobody else can store our thread_id. */
-       i++) {}
-  if (i > my_max) {
-    WARN("Removing nonexistent thread %ld\n", (GC_word)thread_id);
-  } else {
-    GC_delete_gc_thread(thread_table+i);
-  }
-}
-
-
-#ifdef CYGWIN32
-
-/* Return a GC_thread corresponding to a given pthread_t.	*/
-/* Returns 0 if it's not there.					*/
-/* We assume that this is only called for pthread ids that	*/
-/* have not yet terminated or are still joinable.		*/
-static GC_thread GC_lookup_thread(pthread_t id)
-{
-  int i;
-  LONG my_max = GC_get_max_thread_index();
-
-  for (i = 0;
-       i <= my_max &&
-       (!thread_table[i].in_use || thread_table[i].pthread_id != id
-	|| !thread_table[i].in_use);
-       /* Must still be in_use, since nobody else can store our thread_id. */
-       i++);
-  if (i > my_max) return 0;
-  return thread_table + i;
-}
-
-#endif /* CYGWIN32 */
-
-void GC_push_thread_structures GC_PROTO((void))
-{
-    /* Unlike the other threads implementations, the thread table here	*/
-    /* contains no pointers to the collectable heap.  Thus we have	*/
-    /* no private structures we need to preserve.			*/
-# ifdef CYGWIN32
-  { int i; /* pthreads may keep a pointer in the thread exit value */
-    LONG my_max = GC_get_max_thread_index();
-
-    for (i = 0; i <= my_max; i++)
-      if (thread_table[i].in_use)
-	GC_push_all((ptr_t)&(thread_table[i].status),
-                    (ptr_t)(&(thread_table[i].status)+1));
-  }
-# endif
-}
-
-/* Defined in misc.c */
-extern CRITICAL_SECTION GC_write_cs;
-
-void GC_stop_world()
-{
-  DWORD thread_id = GetCurrentThreadId();
-  int i;
-
-  if (!GC_thr_initialized) ABORT("GC_stop_world() called before GC_thr_init()");
-
-  GC_please_stop = TRUE;
-# ifndef CYGWIN32
-    EnterCriticalSection(&GC_write_cs);
-# endif /* !CYGWIN32 */
-  for (i = 0; i <= GC_get_max_thread_index(); i++)
-    if (thread_table[i].stack_base != 0
-	&& thread_table[i].id != thread_id) {
-#     ifdef MSWINCE
-        /* SuspendThread will fail if thread is running kernel code */
-	while (SuspendThread(thread_table[i].handle) == (DWORD)-1)
-	  Sleep(10);
-#     else
-	/* Apparently the Windows 95 GetOpenFileName call creates	*/
-	/* a thread that does not properly get cleaned up, and		*/
-	/* SuspendThread on its descriptor may provoke a crash.		*/
-	/* This reduces the probability of that event, though it still	*/
-	/* appears there's a race here.					*/
-	DWORD exitCode; 
-	if (GetExitCodeThread(thread_table[i].handle,&exitCode) &&
-            exitCode != STILL_ACTIVE) {
-          thread_table[i].stack_base = 0; /* prevent stack from being pushed */
-#         ifndef CYGWIN32
-            /* this breaks pthread_join on Cygwin, which is guaranteed to  */
-	    /* only see user pthreads 					   */
-	    thread_table[i].in_use = FALSE;
-	    CloseHandle(thread_table[i].handle);
-#         endif
-	  continue;
-	}
-	if (SuspendThread(thread_table[i].handle) == (DWORD)-1)
-	  ABORT("SuspendThread failed");
-#     endif
-      thread_table[i].suspended = TRUE;
-    }
-# ifndef CYGWIN32
-    LeaveCriticalSection(&GC_write_cs);
-# endif /* !CYGWIN32 */
-}
-
-void GC_start_world()
-{
-  DWORD thread_id = GetCurrentThreadId();
-  int i;
-  LONG my_max = GC_get_max_thread_index();
-
-  for (i = 0; i <= my_max; i++)
-    if (thread_table[i].stack_base != 0 && thread_table[i].suspended
-	&& thread_table[i].id != thread_id) {
-      if (ResumeThread(thread_table[i].handle) == (DWORD)-1)
-	ABORT("ResumeThread failed");
-      thread_table[i].suspended = FALSE;
-    }
-  GC_please_stop = FALSE;
-}
-
-# ifdef _MSC_VER
-#   pragma warning(disable:4715)
-# endif
-ptr_t GC_current_stackbottom()
-{
-  DWORD thread_id = GetCurrentThreadId();
-  int i;
-  LONG my_max = GC_get_max_thread_index();
-
-  for (i = 0; i <= my_max; i++)
-    if (thread_table[i].stack_base && thread_table[i].id == thread_id)
-      return thread_table[i].stack_base;
-  ABORT("no thread table entry for current thread");
-}
-# ifdef _MSC_VER
-#   pragma warning(default:4715)
-# endif
-
-# ifdef MSWINCE
-    /* The VirtualQuery calls below won't work properly on WinCE, but	*/
-    /* since each stack is restricted to an aligned 64K region of	*/
-    /* virtual memory we can just take the next lowest multiple of 64K.	*/
-#   define GC_get_stack_min(s) \
-        ((ptr_t)(((DWORD)(s) - 1) & 0xFFFF0000))
-# else
-    static ptr_t GC_get_stack_min(ptr_t s)
-    {
-	ptr_t bottom;
-	MEMORY_BASIC_INFORMATION info;
-	VirtualQuery(s, &info, sizeof(info));
-	do {
-	    bottom = info.BaseAddress;
-	    VirtualQuery(bottom - 1, &info, sizeof(info));
-	} while ((info.Protect & PAGE_READWRITE)
-		 && !(info.Protect & PAGE_GUARD));
-	return(bottom);
-    }
-# endif
-
-void GC_push_all_stacks()
-{
-  DWORD thread_id = GetCurrentThreadId();
-  GC_bool found_me = FALSE;
-  int i;
-  int dummy;
-  ptr_t sp, stack_min;
-  GC_thread thread;
-  LONG my_max = GC_get_max_thread_index();
-  
-  for (i = 0; i <= my_max; i++) {
-    thread = thread_table + i;
-    if (thread -> in_use && thread -> stack_base) {
-      if (thread -> id == thread_id) {
-	sp = (ptr_t) &dummy;
-	found_me = TRUE;
-      } else {
-        CONTEXT context;
-        context.ContextFlags = CONTEXT_INTEGER|CONTEXT_CONTROL;
-        if (!GetThreadContext(thread_table[i].handle, &context))
-	  ABORT("GetThreadContext failed");
-
-        /* Push all registers that might point into the heap.  Frame	*/
-        /* pointer registers are included in case client code was	*/
-        /* compiled with the 'omit frame pointer' optimisation.		*/
-#       define PUSH1(reg) GC_push_one((word)context.reg)
-#       define PUSH2(r1,r2) PUSH1(r1), PUSH1(r2)
-#       define PUSH4(r1,r2,r3,r4) PUSH2(r1,r2), PUSH2(r3,r4)
-#       if defined(__x86_64__) 
-          PUSH4(Rdi,Rsi,Rbx,Rdx), PUSH2(Rcx,Rax), PUSH1(Rbp);
-          PUSH4(R8,R9,R10,R11), PUSH4(R12,R13,R14,R15);
-          sp = (ptr_t)context.Rsp;
-#       elif defined(I386)
-          PUSH4(Edi,Esi,Ebx,Edx), PUSH2(Ecx,Eax), PUSH1(Ebp);
-	  sp = (ptr_t)context.Esp;
-#       elif defined(ARM32)
-	  PUSH4(R0,R1,R2,R3),PUSH4(R4,R5,R6,R7),PUSH4(R8,R9,R10,R11),PUSH1(R12);
-	  sp = (ptr_t)context.Sp;
-#       elif defined(SHx)
-	  PUSH4(R0,R1,R2,R3), PUSH4(R4,R5,R6,R7), PUSH4(R8,R9,R10,R11);
-	  PUSH2(R12,R13), PUSH1(R14);
-	  sp = (ptr_t)context.R15;
-#       elif defined(MIPS)
-	  PUSH4(IntAt,IntV0,IntV1,IntA0), PUSH4(IntA1,IntA2,IntA3,IntT0);
-	  PUSH4(IntT1,IntT2,IntT3,IntT4), PUSH4(IntT5,IntT6,IntT7,IntS0);
-	  PUSH4(IntS1,IntS2,IntS3,IntS4), PUSH4(IntS5,IntS6,IntS7,IntT8);
-	  PUSH4(IntT9,IntK0,IntK1,IntS8);
-	  sp = (ptr_t)context.IntSp;
-#       elif defined(PPC)
-	  PUSH4(Gpr0, Gpr3, Gpr4, Gpr5),  PUSH4(Gpr6, Gpr7, Gpr8, Gpr9);
-	  PUSH4(Gpr10,Gpr11,Gpr12,Gpr14), PUSH4(Gpr15,Gpr16,Gpr17,Gpr18);
-	  PUSH4(Gpr19,Gpr20,Gpr21,Gpr22), PUSH4(Gpr23,Gpr24,Gpr25,Gpr26);
-	  PUSH4(Gpr27,Gpr28,Gpr29,Gpr30), PUSH1(Gpr31);
-	  sp = (ptr_t)context.Gpr1;
-#       elif defined(ALPHA)
-	  PUSH4(IntV0,IntT0,IntT1,IntT2), PUSH4(IntT3,IntT4,IntT5,IntT6);
-	  PUSH4(IntT7,IntS0,IntS1,IntS2), PUSH4(IntS3,IntS4,IntS5,IntFp);
-	  PUSH4(IntA0,IntA1,IntA2,IntA3), PUSH4(IntA4,IntA5,IntT8,IntT9);
-	  PUSH4(IntT10,IntT11,IntT12,IntAt);
-	  sp = (ptr_t)context.IntSp;
-#       else
-#         error "architecture is not supported"
-#       endif
-      }
-
-      stack_min = GC_get_stack_min(thread->stack_base);
-
-      if (sp >= stack_min && sp < thread->stack_base)
-        GC_push_all_stack(sp, thread->stack_base);
-      else {
-        WARN("Thread stack pointer 0x%lx out of range, pushing everything\n",
-	     (unsigned long)sp);
-        GC_push_all_stack(stack_min, thread->stack_base);
-      }
-    }
-  }
-  if (!found_me) ABORT("Collecting from unknown thread.");
-}
-
-void GC_get_next_stack(char *start, char **lo, char **hi)
-{
-    int i;
-#   define ADDR_LIMIT (char *)(-1L)
-    char * current_min = ADDR_LIMIT;
-    LONG my_max = GC_get_max_thread_index();
-  
-    for (i = 0; i <= my_max; i++) {
-    	char * s = (char *)thread_table[i].stack_base;
-
-	if (0 != s && s > start && s < current_min) {
-	    current_min = s;
-	}
-    }
-    *hi = current_min;
-    if (current_min == ADDR_LIMIT) {
-    	*lo = ADDR_LIMIT;
-	return;
-    }
-    *lo = GC_get_stack_min(current_min);
-    if (*lo < start) *lo = start;
-}
-
-#if !defined(CYGWIN32)
-
-#if !defined(MSWINCE) && defined(GC_DLL)
-
-/* We register threads from DllMain */
-
-GC_API HANDLE WINAPI GC_CreateThread(
-    LPSECURITY_ATTRIBUTES lpThreadAttributes, 
-    DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, 
-    LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId )
-{
-    return CreateThread(lpThreadAttributes, dwStackSize, lpStartAddress,
-                        lpParameter, dwCreationFlags, lpThreadId);
-}
-
-#else /* defined(MSWINCE) || !defined(GC_DLL))  */
-
-/* We have no DllMain to take care of new threads.  Thus we	*/
-/* must properly intercept thread creation.			*/
-
-typedef struct {
-    LPTHREAD_START_ROUTINE start;
-    LPVOID param;
-} thread_args;
-
-static DWORD WINAPI thread_start(LPVOID arg);
-
-GC_API HANDLE WINAPI GC_CreateThread(
-    LPSECURITY_ATTRIBUTES lpThreadAttributes, 
-    DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, 
-    LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId )
-{
-    HANDLE thread_h = NULL;
-
-    thread_args *args;
-
-    if (!GC_is_initialized) GC_init();
-    		/* make sure GC is initialized (i.e. main thread is attached) */
-    
-    args = GC_malloc_uncollectable(sizeof(thread_args)); 
-	/* Handed off to and deallocated by child thread.	*/
-    if (0 == args) {
-	SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        return NULL;
-    }
-
-    /* set up thread arguments */
-    	args -> start = lpStartAddress;
-    	args -> param = lpParameter;
-
-    thread_h = CreateThread(lpThreadAttributes,
-    			    dwStackSize, thread_start,
-    			    args, dwCreationFlags,
-    			    lpThreadId);
-
-    return thread_h;
-}
-
-static DWORD WINAPI thread_start(LPVOID arg)
-{
-    DWORD ret = 0;
-    thread_args *args = (thread_args *)arg;
-
-    GC_new_thread();
-
-    /* Clear the thread entry even if we exit with an exception.	*/
-    /* This is probably pointless, since an uncaught exception is	*/
-    /* supposed to result in the process being killed.			*/
-#ifndef __GNUC__
-    __try {
-#endif /* __GNUC__ */
-	ret = args->start (args->param);
-#ifndef __GNUC__
-    } __finally {
-#endif /* __GNUC__ */
-	GC_free(args);
-	GC_delete_thread(GetCurrentThreadId());
-#ifndef __GNUC__
-    }
-#endif /* __GNUC__ */
-
-    return ret;
-}
-#endif /* !defined(MSWINCE) && !(defined(__MINGW32__) && !defined(_DLL))  */
-
-#endif /* !CYGWIN32 */
-
-#ifdef MSWINCE
-
-typedef struct {
-    HINSTANCE hInstance;
-    HINSTANCE hPrevInstance;
-    LPWSTR lpCmdLine;
-    int nShowCmd;
-} main_thread_args;
-
-DWORD WINAPI main_thread_start(LPVOID arg);
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-		   LPWSTR lpCmdLine, int nShowCmd)
-{
-    DWORD exit_code = 1;
-
-    main_thread_args args = {
-	hInstance, hPrevInstance, lpCmdLine, nShowCmd
-    };
-    HANDLE thread_h;
-    DWORD thread_id;
-
-    /* initialize everything */
-    GC_init();
-
-    /* start the main thread */
-    thread_h = GC_CreateThread(
-	NULL, 0, main_thread_start, &args, 0, &thread_id);
-
-    if (thread_h != NULL)
-    {
-	WaitForSingleObject (thread_h, INFINITE);
-	GetExitCodeThread (thread_h, &exit_code);
-	CloseHandle (thread_h);
-    }
-
-    GC_deinit();
-    DeleteCriticalSection(&GC_allocate_ml);
-
-    return (int) exit_code;
-}
-
-DWORD WINAPI main_thread_start(LPVOID arg)
-{
-    main_thread_args * args = (main_thread_args *) arg;
-
-    return (DWORD) GC_WinMain (args->hInstance, args->hPrevInstance,
-			       args->lpCmdLine, args->nShowCmd);
-}
-
-# else /* !MSWINCE */
-
-/* Called by GC_init() - we hold the allocation lock.	*/
-void GC_thr_init() {
-    if (GC_thr_initialized) return;
-    GC_main_thread = GetCurrentThreadId();
-    GC_thr_initialized = TRUE;
-
-    /* Add the initial thread, so we can stop it.	*/
-    GC_new_thread();
-}
-
-#ifdef CYGWIN32
-
-struct start_info {
-    void *(*start_routine)(void *);
-    void *arg;
-    GC_bool detached;
-};
-
-int GC_pthread_join(pthread_t pthread_id, void **retval) {
-    int result;
-    int i;
-    GC_thread me;
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf3("thread 0x%x(0x%x) is joining thread 0x%x.\n",
-		 (int)pthread_self(), GetCurrentThreadId(), (int)pthread_id);
-#   endif
-
-    /* Thread being joined might not have registered itself yet. */
-    /* After the join,thread id may have been recycled.		 */
-    /* FIXME: It would be better if this worked more like	 */
-    /* pthread_support.c.					 */
-
-    while ((me = GC_lookup_thread(pthread_id)) == 0) Sleep(10);
-
-    result = pthread_join(pthread_id, retval);
-
-    GC_delete_gc_thread(me);
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf3("thread 0x%x(0x%x) completed join with thread 0x%x.\n",
-		 (int)pthread_self(), GetCurrentThreadId(), (int)pthread_id);
-#   endif
-
-    return result;
-}
-
-/* Cygwin-pthreads calls CreateThread internally, but it's not
- * easily interceptible by us..
- *   so intercept pthread_create instead
- */
-int
-GC_pthread_create(pthread_t *new_thread,
-		  const pthread_attr_t *attr,
-                  void *(*start_routine)(void *), void *arg) {
-    int result;
-    struct start_info * si;
-
-    if (!GC_is_initialized) GC_init();
-    		/* make sure GC is initialized (i.e. main thread is attached) */
-    
-    /* This is otherwise saved only in an area mmapped by the thread */
-    /* library, which isn't visible to the collector.		 */
-    si = GC_malloc_uncollectable(sizeof(struct start_info)); 
-    if (0 == si) return(EAGAIN);
-
-    si -> start_routine = start_routine;
-    si -> arg = arg;
-    if (attr != 0 &&
-        pthread_attr_getdetachstate(attr, &si->detached)
-	== PTHREAD_CREATE_DETACHED) {
-      si->detached = TRUE;
-    }
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf2("About to create a thread from 0x%x(0x%x)\n",
-		 (int)pthread_self(), GetCurrentThreadId);
-#   endif
-    result = pthread_create(new_thread, attr, GC_start_routine, si); 
-
-    if (result) { /* failure */
-      	GC_free(si);
-    } 
-
-    return(result);
-}
-
-void * GC_start_routine(void * arg)
-{
-    struct start_info * si = arg;
-    void * result;
-    void *(*start)(void *);
-    void *start_arg;
-    pthread_t pthread_id;
-    GC_thread me;
-    GC_bool detached;
-    int i;
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf2("thread 0x%x(0x%x) starting...\n",(int)pthread_self(),
-		      				   GetCurrentThreadId());
-#   endif
-
-    /* If a GC occurs before the thread is registered, that GC will	*/
-    /* ignore this thread.  That's fine, since it will block trying to  */
-    /* acquire the allocation lock, and won't yet hold interesting 	*/
-    /* pointers.							*/
-    LOCK();
-    /* We register the thread here instead of in the parent, so that	*/
-    /* we don't need to hold the allocation lock during pthread_create. */
-    me = GC_new_thread();
-    UNLOCK();
-
-    start = si -> start_routine;
-    start_arg = si -> arg;
-    if (si-> detached) me -> flags |= DETACHED;
-    me -> pthread_id = pthread_id = pthread_self();
-
-    GC_free(si); /* was allocated uncollectable */
-
-    pthread_cleanup_push(GC_thread_exit_proc, (void *)me);
-    result = (*start)(start_arg);
-    me -> status = result;
-    pthread_cleanup_pop(0);
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf2("thread 0x%x(0x%x) returned from start routine.\n",
-		 (int)pthread_self(),GetCurrentThreadId());
-#   endif
-
-    return(result);
-}
-
-void GC_thread_exit_proc(void *arg)
-{
-    GC_thread me = (GC_thread)arg;
-    int i;
-
-#   if DEBUG_CYGWIN_THREADS
-      GC_printf2("thread 0x%x(0x%x) called pthread_exit().\n",
-		 (int)pthread_self(),GetCurrentThreadId());
-#   endif
-
-    LOCK();
-    if (me -> flags & DETACHED) {
-      GC_delete_thread(GetCurrentThreadId());
-    } else {
-      /* deallocate it as part of join */
-      me -> flags |= FINISHED;
-    }
-    UNLOCK();
-}
-
-/* nothing required here... */
-int GC_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) {
-  return pthread_sigmask(how, set, oset);
-}
-
-int GC_pthread_detach(pthread_t thread)
-{
-    int result;
-    GC_thread thread_gc_id;
-    
-    LOCK();
-    thread_gc_id = GC_lookup_thread(thread);
-    UNLOCK();
-    result = pthread_detach(thread);
-    if (result == 0) {
-      LOCK();
-      thread_gc_id -> flags |= DETACHED;
-      /* Here the pthread thread id may have been recycled. */
-      if (thread_gc_id -> flags & FINISHED) {
-        GC_delete_gc_thread(thread_gc_id);
-      }
-      UNLOCK();
-    }
-    return result;
-}
-
-GC_PTR GC_get_thread_stack_base()
-{
-#ifdef __x86_64__
-  return ((NT_TIB*)NtCurrentTeb())->StackBase;
-#else
-  extern GC_PTR _tlsbase __asm__ ("%fs:4");
-  return _tlsbase;
-#endif
-}
-
-#else /* !CYGWIN32 */
-
-/*
- * We avoid acquiring locks here, since this doesn't seem to be preemptable.
- * Pontus Rydin suggests wrapping the thread start routine instead.
- */
-#ifdef GC_DLL
-BOOL WINAPI DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved)
-{
-  switch (reason) {
-  case DLL_PROCESS_ATTACH:
-    GC_init();	/* Force initialization before thread attach.	*/
-    /* fall through */
-  case DLL_THREAD_ATTACH:
-    GC_ASSERT(GC_thr_initialized);
-    if (GC_main_thread != GetCurrentThreadId()) {
-        GC_new_thread();
-    } /* o.w. we already did it during GC_thr_init(), called by GC_init() */
-    break;
-
-  case DLL_THREAD_DETACH:
-    GC_delete_thread(GetCurrentThreadId());
-    break;
-
-  case DLL_PROCESS_DETACH:
-    {
-      int i;
-
-      LOCK();
-      for (i = 0; i <= GC_get_max_thread_index(); ++i)
-      {
-          if (thread_table[i].in_use)
-	    GC_delete_gc_thread(thread_table + i);
-      }
-      UNLOCK();
-
-      GC_deinit();
-      DeleteCriticalSection(&GC_allocate_ml);
-    }
-    break;
-
-  }
-  return TRUE;
-}
-#endif /* GC_DLL */
-#endif /* !CYGWIN32 */
-
-# endif /* !MSWINCE */
-
-#endif /* GC_WIN32_THREADS */