AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #3018]

Browse Source 
2006-07-30  Joseph S. Myers  <joseph@codesourcery.com>
	[BZ #3018]
	* Makerules (depfiles): Handle extra-test-objs the same as
	extra-objs.
	(common-mostlyclean): Likewise.
	* dlfcn/Makefile (extra-objs): Add modules to extra-test-objs
	instead.
	* elf/Makefile (extra-objs): Likewise.
	* stdlib/Makefile (extra-objs): Likewise.
This commit is contained in:
Ulrich Drepper 2006-08-21 21:06:35 +00:00
parent 240c62a7e7
commit 376e973ad6
7 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-07-30 Joseph S. Myers <joseph@codesourcery.com>
[BZ #3018]
* Makerules (depfiles): Handle extra-test-objs the same as
extra-objs.
(common-mostlyclean): Likewise.
* dlfcn/Makefile (extra-objs): Add modules to extra-test-objs
instead.
* elf/Makefile (extra-objs): Likewise.
* stdlib/Makefile (extra-objs): Likewise.
2006-08-14 Eric Blake <ebb9@byu.net> 2006-08-14 Eric Blake <ebb9@byu.net>
[BZ #3044] [BZ #3044]

5
Makerules
View File

@ -688,6 +688,7 @@ endif
+depfiles := $(sources:.c=.d) \ +depfiles := $(sources:.c=.d) \
$(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \ $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
$(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \
$(addsuffix .d,$(tests) $(xtests) $(test-srcs)) $(addsuffix .d,$(tests) $(xtests) $(test-srcs))
ifeq ($(build-programs),yes) ifeq ($(build-programs),yes)
+depfiles += $(addsuffix .d,$(others) $(sysdep-others)) +depfiles += $(addsuffix .d,$(others) $(sysdep-others))
@ -1369,8 +1370,8 @@ common-mostlyclean:
$(test-srcs)) \ $(test-srcs)) \
$(addsuffix -bp.out,$(tests) $(xtests) \ $(addsuffix -bp.out,$(tests) $(xtests) \
$(test-srcs))) $(test-srcs)))
-rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \ -rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \
$(install-lib.so) \ $(install-lib) $(install-lib.so) \
$(install-lib.so:%.so=%_pic.a)) $(install-lib.so:%.so=%_pic.a))
-rm -f core -rm -f core
-rm -f $(objpfx)rtld-*.os -rm -f $(objpfx)rtld-*.os

2
dlfcn/Makefile
View File

@ -63,7 +63,7 @@ tststatic-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
tststatic2-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf tststatic2-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
endif endif
extra-objs += $(modules-names:=.os) extra-test-objs += $(modules-names:=.os)
generated := $(modules-names:=.so) generated := $(modules-names:=.so)
include ../Rules include ../Rules

2
elf/Makefile
View File

@ -223,7 +223,7 @@ modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4 \
nodel2mod1 nodel2mod2 nodel2mod3 nodel2mod1 nodel2mod2 nodel2mod3
modules-nodlopen-yes = nodlopenmod nodlopenmod2 modules-nodlopen-yes = nodlopenmod nodlopenmod2
modules-execstack-yes = tst-execstack-mod modules-execstack-yes = tst-execstack-mod
extra-objs += $(addsuffix .os,$(strip $(modules-names))) extra-test-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)

5
nptl/ChangeLog
View File

@ -1,3 +1,8 @@
2006-07-30 Joseph S. Myers <joseph@codesourcery.com>
[BZ #3018]
* Makefile (extra-objs): Add modules to extra-test-objs instead.
2006-08-20 Ulrich Drepper <drepper@redhat.com> 2006-08-20 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Define * sysdeps/unix/sysv/linux/bits/posix_opt.h: Define

2
nptl/Makefile
View File

@ -297,7 +297,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \ tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
tst-tls5modd tst-tls5mode tst-tls5modf \ tst-tls5modd tst-tls5mode tst-tls5modf \
tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod
extra-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
test-extras += $(modules-names) test-extras += $(modules-names)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))

2
stdlib/Makefile
View File

@ -86,7 +86,7 @@ aux += fpioconst mp_clz_tab
distribute := $(distribute) $(mpn-headers) fpioconst.h tst-putenvmod.c distribute := $(distribute) $(mpn-headers) fpioconst.h tst-putenvmod.c
tests-extras += tst-putenvmod tests-extras += tst-putenvmod
extra-objs += tst-putenvmod.os extra-test-objs += tst-putenvmod.os
generated += isomac isomac.out tst-putenvmod.so generated += isomac isomac.out tst-putenvmod.so