diff options
| author | Hans Boehm <Hans_Boehm@hp.com> | 2003-03-04 22:18:08 +0000 |
|---|---|---|
| committer | Hans Boehm <hboehm@gcc.gnu.org> | 2003-03-04 22:18:08 +0000 |
| commit | c62b90642287de048ac1735adeb210e3b78ff874 (patch) | |
| tree | 1d91feb234953cb7730e29e49af3ec28ecb7a656 /boehm-gc/include | |
| parent | 65ebbf81604b9234703aaa0bbe332e8d5301945c (diff) | |
| download | gcc-c62b90642287de048ac1735adeb210e3b78ff874.zip gcc-c62b90642287de048ac1735adeb210e3b78ff874.tar.gz gcc-c62b90642287de048ac1735adeb210e3b78ff874.tar.bz2 | |
gcconfig.h (GC_data_start): declare when needed.
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.
From-SVN: r63809
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 dac604f..b09c484 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 af0d2e4..51d9de0 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; \ |