From 363a641b1c856bf497840c6f7ed975366b48eb0e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 1 Feb 2008 00:01:25 +0000 Subject: * 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. --- sysdeps/unix/Makefile | 4 ++-- sysdeps/unix/make-syscalls.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile index 4ab06ba33e..2696e7fb62 100644 --- 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 0ec8b28fd2..ca82e1f331 100644 --- 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 *@*) -- cgit 1.4.1