diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-12-11 22:58:48 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-12-11 22:58:48 +0000 |
| commit | fc00cf7bcdf3367da105d86185411f7b7eced239 (patch) | |
| tree | 221af9a36258492d9194134a7ce8565621ef1a0d | |
| parent | 73b0c1a19c679745897b9fa2efef0c00469efa92 (diff) | |
| download | glibc-fc00cf7bcdf3367da105d86185411f7b7eced239.tar.gz glibc-fc00cf7bcdf3367da105d86185411f7b7eced239.tar.xz glibc-fc00cf7bcdf3367da105d86185411f7b7eced239.zip | |
Move semaphore.h to sysdeps/pthread/.
Carlos reported failures in conform/ tests in environments where the compiler used could only find headers in glibc's source and build trees, not any previously installed headers <https://sourceware.org/ml/libc-alpha/2014-09/msg00040.html>. This patch moves nptl/semaphore.h to sysdeps/pthread/semaphore.h so that it can be found by builds from all glibc subdirectories; it's not in any way NPTL-specific. (I left the Makefile setting to install this header in nptl/, but maybe it should move as well - it's just not clear to me what ifeq ($(subdir),...) conditional should be used to select the directory to associate the header with for installation purposes. The path in the toplevel Makefile used for begin-end-check also remains hardcoded; it's a known todo issue to rework that test to run in each subdirectory checking the headers installed from that subdirectory, rather than a separate hardcoded list.) Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). I did *not* test a configuration such as that in which Carlos saw failure. * nptl/semaphore.h: Move to ... * sysdeps/pthread/semaphore.h: ... here. * Makefile (installed-headers): Change nptl/semaphore.h to sysdeps/pthread/semaphore.h.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/semaphore.h (renamed from nptl/semaphore.h) | 0 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 35d61bd3cb..7630e80a16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-12-11 Joseph Myers <joseph@codesourcery.com> + + * nptl/semaphore.h: Move to ... + * sysdeps/pthread/semaphore.h: ... here. + * Makefile (installed-headers): Change nptl/semaphore.h to + sysdeps/pthread/semaphore.h. + 2014-12-11 Roland McGrath <roland@hack.frob.com> * misc/tst-error1.c (do_test): Ignore -Wformat-security for diff --git a/Makefile b/Makefile index 51ff5ca28e..b012cede8e 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \ malloc/obstack.h malloc/mcheck.h math/math.h \ math/complex.h math/fenv.h math/tgmath.h misc/sys/uio.h \ $(wildcard nis/rpcsvc/*.h) nptl_db/thread_db.h \ - sysdeps/nptl/pthread.h nptl/semaphore.h \ + sysdeps/nptl/pthread.h sysdeps/pthread/semaphore.h \ nss/nss.h posix/sys/utsname.h posix/sys/times.h \ posix/sys/wait.h posix/sys/types.h posix/unistd.h \ posix/glob.h posix/regex.h posix/wordexp.h posix/fnmatch.h\ diff --git a/nptl/semaphore.h b/sysdeps/pthread/semaphore.h index 763db34da7..763db34da7 100644 --- a/nptl/semaphore.h +++ b/sysdeps/pthread/semaphore.h |