* 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.

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

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 58c5f39..2d67f75 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h
index 8ac709b..c73ecc0 100644 (file)
--- a/boehm-gc/include/gc.h
+++ b/boehm-gc/include/gc.h
@@ -297,6 +297,14 @@ GC_API int GC_dont_precollect;  /* Don't collect as part of                */
                                /* 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));
+
 /*
  * general purpose allocation routines, with roughly malloc calling conv.
  * The atomic versions promise that no relevant pointers are contained

diff --git a/boehm-gc/include/private/gc_priv.h b/boehm-gc/include/private/gc_priv.h
index ad204e9..92067d2 100644 (file)
--- a/boehm-gc/include/private/gc_priv.h
+++ b/boehm-gc/include/private/gc_priv.h
@@ -1629,7 +1629,6 @@ GC_bool GC_collect_or_expand GC_PROTO(( \
                                /* blocks available.  Should be called  */
                                /* until the blocks are available or    */
                                /* until it fails by returning FALSE.   */
-GC_API void GC_init GC_PROTO((void)); /* Initialize collector.         */
 
 #if defined(MSWIN32) || defined(MSWINCE)
   void GC_deinit GC_PROTO((void));

diff --git a/boehm-gc/linux_threads.c b/boehm-gc/linux_threads.c
index ccd7dc6..b26988c 100644 (file)
--- a/boehm-gc/linux_threads.c
+++ b/boehm-gc/linux_threads.c
@@ -204,11 +204,7 @@ GC_thread GC_lookup_thread(pthread_t id);
 
 static GC_bool parallel_initialized = FALSE;
 
-# if defined(__GNUC__)
-    void GC_init_parallel() __attribute__ ((constructor));
-# else
-    void GC_init_parallel();
-# endif
+void GC_init_parallel();
 
 # if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)