diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /include/link.h | |
parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'include/link.h')
-rw-r--r-- | include/link.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/link.h b/include/link.h index 670d40157b..7e7eb79f10 100644 --- a/include/link.h +++ b/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. - Copyright (C) 1995-2014 Free Software Foundation, Inc. + Copyright (C) 1995-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -40,6 +40,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, #include <stdint.h> #include <stddef.h> #include <bits/linkmap.h> +#include <dl-fileid.h> #include <dl-lookupcfg.h> #include <tls.h> #include <bits/libc-lock.h> @@ -235,8 +236,7 @@ struct link_map /* This information is kept to check for sure whether a shared object is the same as one already loaded. */ - dev_t l_dev; - ino64_t l_ino; + struct r_file_id l_file_id; /* Collected information about own RUNPATH directories. */ struct r_search_path_struct l_runpath_dirs; @@ -302,7 +302,9 @@ struct link_map /* Index of the module in the dtv array. */ size_t l_tls_modid; - /* Number of thread_local objects constructed by this DSO. */ + /* Number of thread_local objects constructed by this DSO. This is + atomically accessed and modified and is not always protected by the load + lock. See also: CONCURRENCY NOTES in cxa_thread_atexit_impl.c. */ size_t l_tls_dtor_count; /* Information used to change permission after the relocations are |