qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Roland McGrath 2008-02-01 00:01:25 +00:00
parent 7bd00dbfeb
commit 363a641b1c
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-01-30 Roland McGrath <roland@redhat.com>
* manual/libc.texinfo: Update back-cover text. * manual/libc.texinfo: Update back-cover text.

3
Makeconfig
View File

@ -944,6 +944,9 @@ ifneq (,$(sysdep-makeconfigs))
include $(sysdep-makeconfigs) include $(sysdep-makeconfigs)
endif 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 endif # Makeconfig not yet included

6
nptl/Makefile
View File

@ -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. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # 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 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 \ tests = tst-typesizes \
tst-attr1 tst-attr2 tst-attr3 \ tst-attr1 tst-attr2 tst-attr3 \

4
sysdeps/unix/Makefile
View File

@ -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. # Free Software Foundation, Inc.
# This file is part of the GNU C Library. # 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. # which specifies objects to be compiled as simple Unix system calls.
-include $(common-objpfx)sysd-syscalls -include $(common-objpfx)sysd-syscalls
omit-deps += $(unix-syscalls) omit-deps += $(foreach t,$(sysd-rules-targets),$(unix-syscalls:%=$t))
ifeq (misc,$(subdir)) ifeq (misc,$(subdir))
sysdep_routines += $(unix-extra-syscalls) sysdep_routines += $(unix-extra-syscalls)

8
sysdeps/unix/make-syscalls.sh
View File

@ -146,9 +146,8 @@ shared-only-routines += $file
;; ;;
*) *)
echo "\ echo "\
\$(foreach o,\$(object-suffixes),\$(objpfx)$file\$o) \ \$(foreach p,\$(sysd-rules-targets),\
\$(foreach o,\$(object-suffixes),\$(objpfx)ptw-$file\$o) \ \$(foreach o,\$(object-suffixes),\$(objpfx)\$(patsubst %,\$p,$file)\$o)): \\"
\$(objpfx)rtld-$file.os: \\"
;; ;;
esac esac
@ -216,7 +215,8 @@ shared-only-routines += $file
done done
# And finally, pipe this all into the compiler. # 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 case $weak in
*@*) *@*)