diff options
| author | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-04 22:18:08 +0000 |
|---|---|---|
| committer | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-04 22:18:08 +0000 |
| commit | 83e80d47d1b31102f18d13d6ed0fe0f7887d4d6a (patch) | |
| tree | 1d91feb234953cb7730e29e49af3ec28ecb7a656 /boehm-gc/include | |
| parent | c835a482e12c05467470842000c25c22681aa7bd (diff) | |
| download | gcc-83e80d47d1b31102f18d13d6ed0fe0f7887d4d6a.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63809 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/include')
| -rw-r--r-- | boehm-gc/include/private/gc_priv.h | 8 | ||||
| -rw-r--r-- | boehm-gc/include/private/gcconfig.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/boehm-gc/include/private/gc_priv.h b/boehm-gc/include/private/gc_priv.h index dac604f2a11..b09c4840945 100644 --- a/boehm-gc/include/private/gc_priv.h +++ b/boehm-gc/include/private/gc_priv.h @@ -44,10 +44,6 @@ # include "../gc_mark.h" # endif -# ifndef GCCONFIG_H -# include "gcconfig.h" -# endif - typedef GC_word word; typedef GC_signed_word signed_word; @@ -60,6 +56,10 @@ typedef char * ptr_t; /* A generic pointer to which we can add */ /* Preferably identical to caddr_t, if it */ /* exists. */ +# ifndef GCCONFIG_H +# include "gcconfig.h" +# endif + # ifndef HEADERS_H # include "gc_hdrs.h" # endif diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h index af0d2e4ec49..51d9de0186c 100644 --- a/boehm-gc/include/private/gcconfig.h +++ b/boehm-gc/include/private/gcconfig.h @@ -1810,6 +1810,10 @@ /* platforms as well, though it should be avoided in win32. */ # endif /* LINUX */ +# if defined(SEARCH_FOR_DATA_START) && defined(GC_PRIVATE_H) + extern ptr_t GC_data_start; +# endif + # ifndef CLEAR_DOUBLE # define CLEAR_DOUBLE(x) \ ((word*)x)[0] = 0; \ |