diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-10 13:10:21 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-05-10 15:57:23 -0700 |
| commit | cd9fa98583b51812e906f1e85cc6e370bb4aff87 (patch) | |
| tree | af517ce680211a25af9205b7370cab94fde3fd71 | |
| parent | 802ca5a5efa5d11836b2ffd81c9f6fd42f938ac6 (diff) | |
| download | glibc-cd9fa98583b51812e906f1e85cc6e370bb4aff87.tar.gz glibc-cd9fa98583b51812e906f1e85cc6e370bb4aff87.tar.xz glibc-cd9fa98583b51812e906f1e85cc6e370bb4aff87.zip | |
Hurd: Hurd: dl-sysdep.c: Include code only #ifdef SHARED.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 83afde7d03..cab048947e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> + * sysdeps/mach/hurd/dl-sysdep.c: Conditionalize contents on [SHARED]. + * hurd/hurd/fd.h (_hurd_fd_get): Call HURD_CRITICAL_BEGIN/ HURD_CRITICAL_END around holding _hurd_dtable_lock. * sysdeps/mach/hurd/dirfd (dirfd): Likewise. diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 26a212ef98..13b0010436 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +/* In the static library, this is all handled by dl-support.c + or by the vanilla definitions in the rest of the C library. */ +#ifdef SHARED + #include <hurd.h> #include <link.h> #include <unistd.h> @@ -667,3 +671,5 @@ _dl_init_first (int argc, ...) { /* This no-op definition only gets used if libc is not linked in. */ } + +#endif /* SHARED */ |