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

2005-10-16 Daniel Jacobowitz <dan@codesourcery.com> 

Roland McGrath  <roland@redhat.com>

	* Makerules [module-names] (extra-modules-build): New variable.
	($(extra-modules-build:%=$(objpfx)%.so)): New static pattern rule.
	Depend on libc.so and libc_nonshared.a.
	* dlfcn/Makefile ($(test-modules)): Remove static pattern rule.
	* elf/Makefile (modules-names-nobuild): New variable, add filtmod1.
	($(test-modules)): Remove static pattern rule.
This commit is contained in:
Roland McGrath 2005-10-16 09:25:59 +00:00
parent 809e3018b3
commit aed48a2a23
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-10-16 Daniel Jacobowitz <dan@codesourcery.com>
Roland McGrath <roland@redhat.com>
* Makerules [module-names] (extra-modules-build): New variable.
($(extra-modules-build:%=$(objpfx)%.so)): New static pattern rule.
Depend on libc.so and libc_nonshared.a.
* dlfcn/Makefile ($(test-modules)): Remove static pattern rule.
* elf/Makefile (modules-names-nobuild): New variable, add filtmod1.
($(test-modules)): Remove static pattern rule.
2005-10-15 Thomas Schwinge <tschwinge@gnu.org> 2005-10-15 Thomas Schwinge <tschwinge@gnu.org>
* include/dirent.h: Include <stdbool.h>. * include/dirent.h: Include <stdbool.h>.

10
Makerules
View File

@ -665,14 +665,20 @@ include $(patsubst %,$(..)extra-lib.mk,$(extra-libs))
endif endif
# The makefile may define $(modules-names) # to build additional # The makefile may define $(modules-names) to build additional modules.
# modules. # These are built with $(build-module), except any in $(modules-names-nobuild).
ifdef modules-names ifdef modules-names
# extra-lib.mk is included once for each extra lib to define rules # extra-lib.mk is included once for each extra lib to define rules
# to build it, and to add its objects to the various variables. # to build it, and to add its objects to the various variables.
# During its evaluation, $(lib) is set to the name of the library. # During its evaluation, $(lib) is set to the name of the library.
extra-modules-left := $(modules-names) extra-modules-left := $(modules-names)
include $(patsubst %,$(..)extra-modules.mk,$(modules-names)) include $(patsubst %,$(..)extra-modules.mk,$(modules-names))
extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names))
$(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \
$(objpfx)$(module).os $(common-objpfx)shlib.lds \
$(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
$(build-module)
endif endif
+depfiles := $(sources:.c=.d) \ +depfiles := $(sources:.c=.d) \

2
dlfcn/Makefile
View File

@ -68,8 +68,6 @@ generated := $(modules-names:=.so)
include ../Rules include ../Rules
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
$(build-module)
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
# Build all the modules even when not actually running test programs. # Build all the modules even when not actually running test programs.

8
elf/Makefile
View File

@ -223,6 +223,10 @@ extra-objs += $(addsuffix .os,$(strip $(modules-names)))
# We need this variable to be sure the test modules get the right CPPFLAGS. # We need this variable to be sure the test modules get the right CPPFLAGS.
test-extras += $(modules-names) test-extras += $(modules-names)
# filtmod1.so has a special rule
modules-names-nobuild := filtmod1
include ../Rules include ../Rules
check-abi: check-abi-ld check-abi: check-abi-ld
@ -490,10 +494,6 @@ reldep9mod1.so-no-z-defs = yes
unload3mod4.so-no-z-defs = yes unload3mod4.so-no-z-defs = yes
unload4mod1.so-no-z-defs = yes unload4mod1.so-no-z-defs = yes
# filtmod1.so has a special rule
$(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os
$(build-module)
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
# Build all the modules even when not actually running test programs. # Build all the modules even when not actually running test programs.
tests: $(test-modules) tests: $(test-modules)

3
nptl/Makefile
View File

@ -295,9 +295,6 @@ tst-tls5modd.so-no-z-defs = yes
tst-tls5mode.so-no-z-defs = yes tst-tls5mode.so-no-z-defs = yes
tst-tls5modf.so-no-z-defs = yes tst-tls5modf.so-no-z-defs = yes
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
$(build-module)
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
# Build all the modules even when not actually running test programs. # Build all the modules even when not actually running test programs.
tests: $(test-modules) tests: $(test-modules)