diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:11:58 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:11:58 +0000 |
| commit | d051b143f73189311faf9cd311cc53c6f6a145db (patch) | |
| tree | ecb8deb80e164864cf069e12657de78ed1933b94 /sysdeps | |
| parent | be7dc2b77e368daad6f81e272fc41f1b86166240 (diff) | |
| download | glibc-d051b143f73189311faf9cd311cc53c6f6a145db.tar.gz glibc-d051b143f73189311faf9cd311cc53c6f6a145db.tar.xz glibc-d051b143f73189311faf9cd311cc53c6f6a145db.zip | |
Fix sem_* tdelete, tfind, tsearch, twalk namespace (bug 18536).
The sem_* functions bring in references to tdelete, tfind, tsearch and twalk. But the t* functions are XSI-shaded, while sem_* aren't. This patch fixes this by using __t* instead, exporting those functions from libc at version GLIBC_PRIVATE (since sem_* are in libpthread) and using libc_hidden_* for the benefit of calls within libc. Tested for x86_64 and x86 (testsuite, and comparison of disassembly of installed stripped shared libraries). libpthread gets changes from PLT reordering; addresses in libc change because of PLT / dynamic symbol table changes. [BZ #18536] * misc/tsearch.c (__tsearch): Use libc_hidden_def. (__tfind): Likewise. (__tdelete): Likewise. (__twalk): Likewise. * misc/Versions (libc): Add __tdelete, __tfind, __tsearch and __twalk to GLIBC_PRIVATE. * include/search.h (__tsearch): Use libc_hidden_proto. (__tfind): Likewise. (__tdelete): Likewise. (__twalk): Likewise. * nptl/sem_close.c (sem_close): Call __twalk instead of twalk. Call __tdelete instead of tdelete. * nptl/sem_open.c (check_add_mapping): Call __tfind instead of tfind. Call __tsearch instead of tsearch. * sysdeps/sparc/sparc32/sem_open.c (check_add_mapping): Likewise. * conform/Makefile (test-xfail-POSIX/semaphore.h/linknamespace): Remove variable. (test-xfail-POSIX2008/semaphore.h/linknamespace): Likewise.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/sparc/sparc32/sem_open.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc32/sem_open.c b/sysdeps/sparc/sparc32/sem_open.c index af9233c653..2698d195ba 100644 --- a/sysdeps/sparc/sparc32/sem_open.c +++ b/sysdeps/sparc/sparc32/sem_open.c @@ -79,7 +79,8 @@ check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing) fake->dev = st.st_dev; fake->ino = st.st_ino; - struct inuse_sem **foundp = tfind (fake, &__sem_mappings, __sem_search); + struct inuse_sem **foundp = __tfind (fake, &__sem_mappings, + __sem_search); if (foundp != NULL) { /* There is already a mapping. Use it. */ @@ -108,7 +109,7 @@ check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing) /* Insert the new value. */ if (existing != MAP_FAILED - && tsearch (newp, &__sem_mappings, __sem_search) != NULL) + && __tsearch (newp, &__sem_mappings, __sem_search) != NULL) /* Successful. */ result = existing; else |