diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-08-21 05:32:21 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-08-21 05:32:39 -0700 |
| commit | 54e4b8f21590d57ec9a2f2ad81a17c57e3b3984f (patch) | |
| tree | 59e75443b45d8ad88b3a47fa52a23e0e22050899 /elf | |
| parent | 1dbbb1ec7af9026bbdc6dd265525de0c3958406c (diff) | |
| download | glibc-54e4b8f21590d57ec9a2f2ad81a17c57e3b3984f.tar glibc-54e4b8f21590d57ec9a2f2ad81a17c57e3b3984f.tar.gz glibc-54e4b8f21590d57ec9a2f2ad81a17c57e3b3984f.tar.bz2 glibc-54e4b8f21590d57ec9a2f2ad81a17c57e3b3984f.zip | |
Mark __libc_multiple_libcs with attribute_hidden [BZ #18822]
Since __libc_multiple_libcs is defined as hidden symbol in init-first.c,
it should be always marked with attribute_hidden.
[BZ #18822]
* csu/libc-start.c (__libc_multiple_libcs): Removed.
* elf/dl-open.c: Include <libc-internal.h>.
(__libc_multiple_libcs): Removed.
* elf/dl-sysdep.c: Include <libc-internal.h> instead of
<hp-timing.h>.
* include/libc-internal.h (__libc_multiple_libcs): New.
* misc/sbrk.c: Include <libc-internal.h>.
(__libc_multiple_libcs): Removed.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-open.c | 3 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 2d8948aab1..c539f10cf3 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -33,12 +33,11 @@ #include <tls.h> #include <stap-probe.h> #include <atomic.h> +#include <libc-internal.h> #include <dl-dst.h> -extern int __libc_multiple_libcs; /* Defined in init-first.c. */ - /* We must be careful not to leave us in an inconsistent state. Thus we catch any error and re-raise it after cleaning up. */ diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 4053ff3c07..c4ff8b2937 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -41,7 +41,7 @@ #include <dl-machine.h> #include <dl-procinfo.h> #include <dl-osinfo.h> -#include <hp-timing.h> +#include <libc-internal.h> #include <tls.h> #include <dl-tunables.h> |