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

Merge branch 'master' of ssh://sources.redhat.com/git/glibc 

Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2010-04-08 15:57:39 -07:00
parent de240a05b3 df5efd61b0
commit 39be1d1f7b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -13,6 +13,13 @@
* sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise.
* math/libm-test.inc (cproj_test): Fix test. * math/libm-test.inc (cproj_test): Fix test.
2010-04-08 Roland McGrath <roland@redhat.com>
* Makerules (libc-abis): Variable removed.
($(common-objpfx)libc-abis.h): Depend on Makerules too.
Use automatic variables in commands.
Depend on first libc-abis from $(sysdirs) or $(..).
2010-04-07 Ulrich Drepper <drepper@redhat.com> 2010-04-07 Ulrich Drepper <drepper@redhat.com>
* posix/bug-getopt1.c: New file. * posix/bug-getopt1.c: New file.

12
Makerules
View File

@ -111,13 +111,13 @@ endif # $(versioning) = yes
ifndef avoid-generated ifndef avoid-generated
before-compile := $(common-objpfx)libc-abis.h $(before-compile) before-compile := $(common-objpfx)libc-abis.h $(before-compile)
libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \ $(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis \
$(..)$D/libc-abis)) \ $(firstword $(wildcard $(sysdirs:=/libc-abis)) \
$(..)libc-abis) $(..)libc-abis) \
$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis) $(..)Makerules
$(SHELL) $(..)scripts/gen-libc-abis \ $(SHELL) $< \
$(base-machine)-$(config-vendor)-$(config-os) \ $(base-machine)-$(config-vendor)-$(config-os) \
< $(libc-abis) > $@T < $(word 2,$^) > $@T
$(move-if-change) $@T $@ $(move-if-change) $@T $@
common-generated += $(common-objpfx)libc-abis.h common-generated += $(common-objpfx)libc-abis.h
endif # avoid-generated endif # avoid-generated