Re: Support installing headers for bootstrapping libgcc

["Joseph S. Myers" <joseph at codesourcery dot com>]

On Fri, 9 Mar 2012, Roland McGrath wrote:

> > Yes, installing them from install-headers does seem better if there's no 
> > definite reason why install-headers should not install them 
> > unconditionally.  I've tested (on x86_64) the following patch to do this.
> 
> Please make it two separate changes.  bits/stdio_lim.h can go in now.
> But we still need to let air the question of why we ever used the
> move-if-change logic for bits/syscall.h, IMHO.

I haven't heard any comments on that and I doubt there will be further 
comments now; it was probably just some attempt at an optimization.  
Here's the current version of the bits/syscall.h patch.

2012-03-14  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
	bits/syscall.h.
	($(objpfx)syscall-%.h): Rename rule to $(objpfx)bits/syscall.h.
	($(objpfx)syscall-%.d): Rename rule to $(objpfx)bits/syscall.d.
	($(inst_includedir)/bits/syscall.h): Remove rule.
	($(objpfx)bits/syscall.d): Include instead of
	$(objpfx)syscall-list.d.
	(generated): Change syscall-list.h and syscall-list.d to
	bits/syscall.h and bits/syscall.d.

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index a97487f..27117b7 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -34,9 +34,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \
 		  sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \
 		  bits/signalfd.h bits/timerfd.h bits/epoll.h \
-		  bits/socket_type.h
-
-install-others += $(inst_includedir)/bits/syscall.h
+		  bits/socket_type.h bits/syscall.h
 
 tests += tst-clone
 
@@ -62,7 +60,7 @@ ifndef syscall-list-includes
 syscall-list-includes := bits/wordsize.h
 endif
 
-$(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
+$(objpfx)bits/syscall.h $(objpfx)bits/syscall.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
 	$(make-target-directory)
 	{ \
 	 echo '/* Generated at libc build time from kernel syscall list.  */';\
@@ -97,17 +95,11 @@ endif
 	rm -f $(foreach v,$(syscall-list-variants),$(@:.h=.d)-t$(v))
 	mv -f $(@:.h=.d)-t3 $(@:.h=.d)
 
-$(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h $(+force)
-	$(make-target-directory)
-	if test -r $@ && cmp -s $< $@; \
-	then echo 'bits/syscall.h unchanged'; \
-	else $(INSTALL_DATA) $< $@; fi
-
 ifndef no_deps
 # Get the generated list of dependencies (probably /usr/include/asm/unistd.h).
--include $(objpfx)syscall-list.d
+-include $(objpfx)bits/syscall.d
 endif
-generated += syscall-list.h syscall-list.d
+generated += bits/syscall.h bits/syscall.d
 endif
 
 ifeq ($(subdir),time)

-- 
Joseph S. Myers
joseph@codesourcery.com