Message ID | alpine.DEB.2.10.1412112237260.11963@digraph.polyomino.org.uk |
---|---|
State | New |
Headers | show |
That's fine. Sensible directories to have semaphore.h added to headers by sysdeps/pthread would be posix or rt. But it hardly matters. I prefer the move to the wrapper because it feels more proper and the alternative was adding new cruft, but for the makefile bit there is no change required so there is no strong reason to worry about it until (unless) there is a non-NPTL configuration using sysdeps/pthread. Thanks, Roland
diff --git a/Makefile b/Makefile index 51ff5ca..b012ced 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 similarity index 100% rename from nptl/semaphore.h rename to sysdeps/pthread/semaphore.h
On Thu, 11 Dec 2014, Roland McGrath wrote: > I think moving semaphore.h to sysdeps/pthread/ is sound. This patch does that move. (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. 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.