* Makeconfig (sysd-rules-targets): New variable.

	* sysdeps/unix/make-syscalls.sh: Use it in the rules emitted.
	* sysdeps/unix/Makefile (omit-deps): Append variants for each target.

diff --git a/ChangeLog b/ChangeLog
index 8be3612c614d708e03be36d2228dae7833a6c217..b6f044a68fddc68c5d1e4936e819b21134b640e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31  Roland McGrath  <roland@redhat.com>
+
+       * Makeconfig (sysd-rules-targets): New variable.
+       * sysdeps/unix/make-syscalls.sh: Use it in the rules emitted.
+       * sysdeps/unix/Makefile (omit-deps): Append variants for each target.
+
 2008-01-30  Roland McGrath  <roland@redhat.com>
 
        * manual/libc.texinfo: Update back-cover text.

diff --git a/Makeconfig b/Makeconfig
index d7cf0aa03136a731653a69df01f2738c5c1f134a..d269936f323001871a19b15b6d8d37c6a59c334c 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -944,6 +944,9 @@ ifneq (,$(sysdep-makeconfigs))
 include $(sysdep-makeconfigs)
 endif
 
+# Compute just the target patterns.  Makeconfig has set sysd-rules-patterns.
+sysd-rules-targets := $(foreach p,$(sysd-rules-patterns),\
+                               $(firstword $(subst :, ,$p)))
 
 endif # Makeconfig not yet included
 

diff --git a/nptl/Makefile b/nptl/Makefile
index 00cf40d695e8499ef88c8f0af8f80b559b630b65..a55d7f5e92ab25f537dd45d1a8db475b153c9dd9 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008
+#      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -192,9 +193,6 @@ CFLAGS-tcdrain.c = -fexceptions -fasynchronous-unwind-tables
 
 CFLAGS-pt-system.c = -fexceptions
 
-# Don't generate deps for calls with no sources.  See sysdeps/unix/Makefile.
-omit-deps = $(unix-syscalls:%=ptw-%)
-
 
 tests = tst-typesizes \
        tst-attr1 tst-attr2 tst-attr3 \

diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 4ab06ba33ebb0ee49f687ea43facec2999d44951..2696e7fb62f2d2aebeafaa1b9b0b95605d31971d 100644 (file)
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,1992,1993,1994,1995,1996,1997,1998,1999,2003, 2006
+# Copyright (C) 1991,1992,1993,1994,1995,1996,1997,1998,1999,2003, 2006, 2008
 #      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -260,7 +260,7 @@ ifndef inhibit-unix-syscalls
 # which specifies objects to be compiled as simple Unix system calls.
 
 -include $(common-objpfx)sysd-syscalls
-omit-deps += $(unix-syscalls)
+omit-deps += $(foreach t,$(sysd-rules-targets),$(unix-syscalls:%=$t))
 
 ifeq (misc,$(subdir))
 sysdep_routines += $(unix-extra-syscalls)

diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 0ec8b28fd21f8ac6c4e3bde45e5127a2735ec613..ca82e1f3311100d9028a44fa63371d2ee39bd8f7 100644 (file)
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -146,9 +146,8 @@ shared-only-routines += $file
     ;;
   *)
     echo "\
-\$(foreach o,\$(object-suffixes),\$(objpfx)$file\$o) \
-\$(foreach o,\$(object-suffixes),\$(objpfx)ptw-$file\$o) \
-\$(objpfx)rtld-$file.os: \\"
+\$(foreach p,\$(sysd-rules-targets),\
+\$(foreach o,\$(object-suffixes),\$(objpfx)\$(patsubst %,\$p,$file)\$o)): \\"
     ;;
   esac
 
@@ -216,7 +215,8 @@ shared-only-routines += $file
   done
 
   # And finally, pipe this all into the compiler.
-  echo '       ) | $(compile-syscall)'
+  echo '       ) | $(compile-syscall) '"\
+\$(foreach p,\$(patsubst %$file,%,\$(basename \$(@F))),\$(\$(p)CPPFLAGS))"
 
   case $weak in
   *@*)