From: Richard Henderson <rth@twiddle.net>
Date: Sat, 17 May 2014 18:20:44 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/roland/nptl-alpha'
X-Git-Tag: glibc-2.20~477
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ab21431318d99c94e644606dee1e6a4545d98007;p=glibc.git

Merge remote-tracking branch 'origin/roland/nptl-alpha'
---

ab21431318d99c94e644606dee1e6a4545d98007
diff --cc ChangeLog
index c16e823640,c2ee431d5b..6223f79fe6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,71 -1,8 +1,74 @@@
 +2014-05-17  David S. Miller  <davem@davemloft.net>
 +
 +	* sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP):
 +	Protect with __USE_GNU.
 +	(TIOCSET_TEMPT): Likewise.
 +	(TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS,
 +	TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as
 +	these are already provided in bits/ioctl-types.h
 +
  2014-05-16  Roland McGrath  <roland@hack.frob.com>
  
+ 	* sysdeps/unix/sysv/linux/alpha/arch-fork.h: New file.
+ 	* sysdeps/unix/sysv/linux/ia64/nptl/fork.c: File removed.
+ 
 +	* sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
 +	Use wait4 regardless of [__NR_waitpid].
 +
 +2014-05-16  Maciej W. Rozycki  <macro@codesourcery.com>
 +
 +	PR libgcc/60166
 +	* sysdeps/arm/soft-fp/sfp-machine.h (_FP_NANFRAC_S, _FP_NANFRAC_D)
 +	(_FP_NANSIGN_Q): Set the quiet bit.
 +
 +2014-05-16  Joseph Myers  <joseph@codesourcery.com>
 +
 +	* benchtests/Makefile
 +	($(addprefix $(objpfx)bench-,$(bench-math))): Depend on $(libm),
 +	not $(common-objpfx)math/libm.so.
 +	($(addprefix $(objpfx)bench-,$(bench-pthread))): Depend on
 +	$(shared-thread-library), not $(common-objpfx)nptl/libpthread.so.
 +	* elf/Makefile ($(objpfx)noload): Depend on $(libdl), not
 +	$(common-objpfx)dlfcn/libdl.so.
 +	($(objpfx)tst-audit8): Depend on $(libm), not
 +	$(common-objpfx)math/libm.so.
 +	* malloc/Makefile ($(objpfx)libmemusage.so): Depend on $(libdl),
 +	not $(common-objpfx)dlfcn/libdl.so.
 +	* math/Makefile
 +	($(addprefix $(objpfx),$(filter-out $(tests-static),$(tests)))):
 +	Depend on $(libm), not $(objpfx)libm.so.  Do not condition on
 +	[$(build-shared) = yes].
 +	($(objpfx)test-fenv-tls): Depend on $(shared-thread-library), not
 +	$(common-objpfx)nptl/libpthread.so.
 +	* misc/Makefile ($(objpfx)tst-tsearch): Depend on $(libm), not
 +	$(common-objpfx)math/libm.so$(libm.so-version) or
 +	$(common-objpfx)math/libm.a depending on [$(build-shared) = yes].
 +	* nptl/Makefile ($(objpfx)tst-unload): Depend on $(libdl), not
 +	$(common-objpfx)dlfcn/libdl.so.
 +	* setjmp/Makefile (link-libm): Remove variable.
 +	($(objpfx)tst-setjmp-fp): Depend on $(libm), not $(link-libm).
 +	* stdio-common/Makefile (link-libm): Remove variable.
 +	($(objpfx)tst-printf-round): Depend on $(libm), not $(link-libm).
 +	* stdlib/Makefile (link-libm): Remove variable.
 +	($(objpfx)bug-getcontext): Depend on $(libm), not $(link-libm).
 +	($(objpfx)tst-strtod-round): Likewise.
 +	($(objpfx)tst-tininess): Likewise.
 +	($(objpfx)tst-strtod-underflow): Likewise.
 +	($(objpfx)tst-strtod6): Likewise.
 +	($(objpfx)tst-tls-atexit): Depend on $(shared-thread-library) and
 +	$(libdl), not $(common-objpfx)nptl/libpthread.so and
 +	$(common-objpfx)dlfcn/libdl.so.
 +
 +2014-05-16  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC]: Guard
 +	BSD terminal modes definitions.
 +
 +2014-05-16  Roland McGrath  <roland@hack.frob.com>
 +
 +	* sysdeps/unix/sysv/linux/arm/arch-fork.h: New file.
 +	* sysdeps/unix/sysv/linux/arm/fork.c: File removed.
 +
  	* sysdeps/unix/sysv/linux/arch-fork.h: New file.
  	* sysdeps/unix/sysv/linux/i386/fork.h: Moved ...
  	* sysdeps/unix/sysv/linux/i386/arch-fork.h: ... here.