Merge commit '29776e85da637ec4d44b2b2822d6934a50c0084b' into boehm-demers-weiser-gc

Conflicts:
	libguile/gc-card.c
	libguile/gc.c
	libguile/gc.h
	libguile/ports.c

diff --cc configure.in
Simple merge

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/eval.c
Simple merge

diff --cc libguile/fports.c
Simple merge

diff --cc libguile/init.c
Simple merge

diff --cc libguile/numbers.c
Simple merge

diff --cc libguile/ports.c
index fc716be,6cb7796..9c6129d
--- 1/libguile/ports.c
--- 2/libguile/ports.c
+++ b/libguile/ports.c
@@@ -570,35 -511,13 +573,17 @@@ scm_new_port_table_entry (scm_t_bits ta
  
    entry->file_name = SCM_BOOL_F;
    entry->rw_active = SCM_PORT_NEITHER;
+   entry->port = z;
  
-   scm_i_port_table[scm_i_port_table_size] = entry;
-   scm_i_port_table_size++;
+   SCM_SET_CELL_TYPE (z, tag);
+   SCM_SETPTAB_ENTRY (z, entry);
  
-   entry->port = z;
-   SCM_SET_CELL_TYPE(z, tag);
-   SCM_SETPTAB_ENTRY(z, entry);
+   scm_hashq_set_x (scm_i_port_weak_hash, z, SCM_BOOL_F);
  
 +  /* For each new port, register a finalizer so that it port type's free
 +     function can be invoked eventually.  */
 +  register_finalizer_for_port (z);
 +
    return z;
  }
  #undef FUNC_NAME

diff --cc libguile/srfi-14.c
Simple merge

diff --cc libguile/threads.c
Simple merge

diff --cc libguile/weaks.h
Simple merge

diff --cc test-suite/Makefile.am
Simple merge