[COMMITTED] Get rid of nptl/sysdeps/pthread/ subdirectory

Message ID lneb4d$ag8$1@ger.gmane.org
State Committed
Headers

Commit Message

Stefan Liebler June 13, 2014, 8:01 a.m. UTC
  On 06/12/2014 11:02 PM, Roland McGrath wrote:
> This directory never should have existed even for the add-on.  This
> conflated three different kinds of things, which are now separated:
>
> * Things that depend only on the public pthread.h API
>    -> sysdeps/pthread/
> * Things that depend on NPTL implementation details
>    -> sysdeps/nptl/
> * Parts of the NPTL implementation itself
>    -> nptl/ (include/ for list.h)
>
> Verified on x86_64-linux-gnu and i686-linux-gnu that there are no code
> changes except for libpthread.so getting some offset adjustments because
> the assertion file name strings in its .rodata changed.
>
> I've also grepped for potentially affected #include's for other
> configurations.  There are two, both of which are moot after other pending
> patches on the roland/nptl-ia64 and roland/nptl-microblaze branches.  So
> the ia64 and microblaze builds are broken now, and will be fixed by their
> maintainers reviewing and approving the machine-specific patches I have
> already posted.
>
>
> Thanks,
> Roland
>

Hi Roland,
the test begin-end-check fails after this patch due to missing file: 
nptl/sysdeps/pthread/pthread.h.
I have adjusted the Makefile variable installed-headers to the new 
location of the header.
Tested on s390.
Please retest and commit.
Bye

---
2014-06-13  Stefan Liebler  <stli@linux.vnet.ibm.com>

	* Makefile (installed-header):
	Adjust path of pthread.h header.
---
  

Comments

Roland McGrath June 13, 2014, 11:39 p.m. UTC | #1
> the test begin-end-check fails after this patch due to missing file: 
> nptl/sysdeps/pthread/pthread.h.
> I have adjusted the Makefile variable installed-headers to the new 
> location of the header.

I committed it.


Thanks,
Roland
  

Patch

diff --git a/Makefile b/Makefile
index ad18034..51ff5ca 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 \
-		    nptl/sysdeps/pthread/pthread.h nptl/semaphore.h \
+		    sysdeps/nptl/pthread.h nptl/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\