diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-23 00:28:56 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-23 00:28:56 +0000 |
| commit | ce029034776e856c62872540e12dfbd3f87c5b23 (patch) | |
| tree | de56600c16419b970a38e8a7932d6f2c3e30d191 /boehm-gc | |
| parent | eb4c5cc2de216a44c1874c8ae77871b87c2bcaa5 (diff) | |
| download | gcc-ce029034776e856c62872540e12dfbd3f87c5b23.tar.gz | |
* 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
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 7 | ||||
| -rw-r--r-- | boehm-gc/include/gc.h | 8 | ||||
| -rw-r--r-- | boehm-gc/include/private/gc_priv.h | 1 | ||||
| -rw-r--r-- | boehm-gc/linux_threads.c | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 58c5f39071e..2d67f75489a 100644 --- 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 8ac709b9b5d..c73ecc0ae7a 100644 --- 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 ad204e99267..92067d24e70 100644 --- 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 ccd7dc65a74..b26988cef9e 100644 --- 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) |