diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/link.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/include/link.h b/include/link.h index 2e771e433a..2acc836380 100644 --- a/include/link.h +++ b/include/link.h @@ -79,22 +79,6 @@ struct r_search_path_struct int malloced; }; -/* Type used by the l_nodelete member. */ -enum link_map_nodelete -{ - /* This link map can be deallocated. */ - link_map_nodelete_inactive = 0, /* Zero-initialized in _dl_new_object. */ - - /* This link map cannot be deallocated. */ - link_map_nodelete_active, - - /* This link map cannot be deallocated after dlopen has succeded. - dlopen turns this into link_map_nodelete_active. dlclose treats - this intermediate state as link_map_nodelete_active. */ - link_map_nodelete_pending, -}; - - /* Structure describing a loaded shared object. The `l_next' and `l_prev' members form a chain of all the shared objects loaded at startup. @@ -218,10 +202,17 @@ struct link_map freed, ie. not allocated with the dummy malloc in ld.so. */ - /* Actually of type enum link_map_nodelete. Separate byte due to - a read in add_dependency in elf/dl-lookup.c outside the loader - lock. Only valid for l_type == lt_loaded. */ - unsigned char l_nodelete; + /* NODELETE status of the map. Only valid for maps of type + lt_loaded. Lazy binding sets l_nodelete_active directly, + potentially from signal handlers. Initial loading of an + DF_1_NODELETE object set l_nodelete_pending. Relocation may + set l_nodelete_pending as well. l_nodelete_pending maps are + promoted to l_nodelete_active status in the final stages of + dlopen, prior to calling ELF constructors. dlclose only + refuses to unload l_nodelete_active maps, the pending status is + ignored. */ + bool l_nodelete_active; + bool l_nodelete_pending; #include <link_map.h> |