Don't install bits/libc-lock.h or bits/stdio-lock.h.

The bits/libc-lock.h and bits/stdio-lock.h headers are installed, but
not used by any other installed header.

Accordingly, this patch stops these headers from being installed.  A
followup is intended to move these headers out of the bits/ namespace.

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).

	* Makefile (headers): Remove bits/libc-lock.h.
	* libio/Makefile (headers): Remove bits/stdio-lock.h.

diff --git a/ChangeLog b/ChangeLog
index bd2152e..a911d6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-09-03  Joseph Myers  <joseph@codesourcery.com>
 
+       * Makefile (headers): Remove bits/libc-lock.h.
+       * libio/Makefile (headers): Remove bits/stdio-lock.h.
+
        * libio/libio.h [_IO_MTSAFE_IO]: Remove include of
        <bits/stdio-lock.h> and commented-out include of <comthread.h>.
        * include/libio.h [!_ISOMAC && _IO_MTSAFE_IO]: Include

diff --git a/Makefile b/Makefile
index 658ccfa..e07309e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif # $(AUTOCONF) = no
                   subdir_objs subdir_stubs subdir_testclean            \
                   $(addprefix install-, no-libc.a bin lib data headers others)
 \f
-headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
+headers := limits.h values.h features.h gnu-versions.h \
           bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
 
 echo-headers: subdir_echo-headers

diff --git a/libio/Makefile b/libio/Makefile
index 604f419..a1d1741 100644 (file)
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -22,7 +22,7 @@ subdir        := libio
 
 include ../Makeconfig
 
-headers        := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
+headers        := stdio.h libio.h _G_config.h bits/stdio.h \
           bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
 
 routines       :=                                                            \