diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-09-28 14:29:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-09-28 14:29:14 -0700 |
| commit | 91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e (patch) | |
| tree | 6e7e0e2f9c73f59bbce8ad7941db09edd91f9255 | |
| parent | cc87f7d8511e6ca777211abea0bf979138c4c60d (diff) | |
| download | glibc-91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e.tar.gz glibc-91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e.tar.xz glibc-91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e.zip | |
Conditionalize elf/dl-sysdep.c contents on [SHARED].
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 7108c3c171..ab2620768e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-09-28 Roland McGrath <roland@hack.frob.com> + * elf/dl-sysdep.c: Conditionalize whole contents on [SHARED]. + * Makeconfig (nssobjdir, resolvobjdir): Remove variables. (elfobjdir): Move out of conditionals. diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 7d2283910e..fb0849a543 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -1,6 +1,5 @@ /* Operating system support for run-time dynamic linker. Generic Unix version. - Copyright (C) 1995-1998,2000-2010,2012 - Free Software Foundation, Inc. + Copyright (C) 1995-2012 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 @@ -17,6 +16,12 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +/* We conditionalize the whole of this file rather than simply eliding it + from the static build, because other sysdeps/ versions of this file + might define things needed by a static build. */ + +#ifdef SHARED + #include <assert.h> #include <elf.h> #include <errno.h> @@ -592,3 +597,5 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, return result; } + +#endif |