From: Andreas Jaeger <aj@suse.de>
Date: Wed, 24 Oct 2012 07:10:52 +0000 (+0200)
Subject: Merge branch 'master' into aj/shared-linux-fcntl
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2;p=thirdparty%2Fglibc.git

Merge branch 'master' into aj/shared-linux-fcntl
---

aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2
diff --cc ChangeLog
index def4ac39b4f,f67a38fc5d5..06676a3feb6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,78 +1,84 @@@
+ 2012-10-24  Andreas Jaeger  <aj@suse.de>
+ 
+ 	* io/fcntl.h: Always define mode_t, off_t, pid_t and use these
+ 	types for creat, creat64, lockf, posix_fadvise, posix_fallocate.
+ 	[__USE_LARGEFILE64 && !__off64_t_defined]: Define off64_t.
+ 	[__USE_LARGEFILE64]: Use off64_t in declaration of lock64,
+ 	posix_fadvise64, posix_fallocate64.
+ 
+ 	* sysdeps/unix/sysv/linux/x86/bits/fcntl.h (F_GETLK, F_SETLK)
+ 	(F_SETLKW) [__x86_64]: Remove, provided by <bits/fcntl-linux.h>.
+ 	(F_GETLK, F_SETLK, F_SETLKW) [!__USE_FILE_OFFSET64 && !__x86_64__]:
+ 	Likewise.
+ 	(F_GETLK, F_SETLK, F_SETLKW) [__USE_FILE_OFFSET64 && ! __x86_64__]:
+ 	Likewise.
+ 	(F_GETLK64, F_SETLK64, F_SETLKW64) [!__x86_64__]: Likewise.
+ 
+ 	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (F_GETLK, F_SETLK)
+ 	(F_SETLKW) [__USE_FILE_OFFSET64]: Remove, provided by
+ 	<bits/fcntl-linux.h>.
+ 	(F_GETLK64, F_SETLK64, F_SETLKW64) [__WORDSIZE == 64]: Likewise.
+ 
+ 	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (F_DUPFD, F_GETFD)
+ 	(F_SETFD, F_GETFL, F_SETFL): Remove, provided by <bits/fcntl-linux.h>.
+ 	(F_GETLK, F_SETLK, F_SETLKW) [__WORDSIZE == 64]: Likewise.
+ 	(F_GETLK, F_SETLK, F_SETLKW, F_GETLK64, F_SETLK64, F_SETLKW64)
+ 	[__WORDSIZE != 64]: Likewise.
+ 
+ 2012-10-23  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* Makeconfig (run-built-tests): New variable.
+ 	* Rules [$(cross-compiling) = yes]: Change condition to
+ 	[$(run-built-tests) = no].
+ 	* catgets/Makefile [$(cross-compiling) != yes]: Change condition
+ 	to [$(run-built-tests) = yes].
+ 	* elf/Makefile [$(cross-compiling) = no]: Likewise
+ 	* grp/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* iconv/Makefile [$(cross-compiling) != yes]: Likewise.
+ 	* iconvdata/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* intl/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* io/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* libio/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* malloc/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* misc/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* posix/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* resolv/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* stdio-common/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* stdlib/Makefile [$(cross-compiling) = no]: Likewise.
+ 	* string/Makefile [$(cross-compiling) = no]: Likewise.
+ 
+ 	* posix/Makefile ($(objpfx)globtest.out): Pass
+ 	$(run-program-prefix) to globtest.sh, not $(elf-objpfx) and
+ 	$(rtld-installed-name).
+ 	* posix/globtest.sh (elf_objpfx): Remove variable.
+ 	(rtld_installed_name): Likewise.
+ 	(library_path): Likewise.
+ 	(run_program_prefix): New variable.  Use for running globtest
+ 	binary.
+ 
+ 2012-10-23  Jim Blandy  <jimb@codesourcery.com>
+ 	    Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* Makeconfig (host-built-program-cmd): New variable.
+ 	* elf/Makefile (tst-stackguard1-ARGS): Use
+ 	$(host-built-program-cmd).
+ 	* posix/Makefile (tst-exec-ARGS): Use $(host-built-program-cmd).
+ 	(tst-spawn-ARGS): Likewise.
+ 	* rt/Makefile (tst-mqueue7-ARGS): Use $(host-built-program-cmd).
+ 
+ 2012-10-23  Joseph Myers  <joseph@codesourcery.com>
+ 	    Jim Blandy  <jimb@codesourcery.com>
+ 
+ 	* Makeconfig (run-via-rtld-prefix): New variable.
+ 	(run-program-prefix): Define in terms of $(run-via-rtld-prefix).
+ 	(built-program-cmd): Likewise.
+ 
 +2012-10-23  Andreas Jaeger  <aj@suse.de>
 +
 +	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Remove all
 +	definitions and declarations that are provided by
 +	<bits/fcntl-linux.h> and include <bits/fcntl-linux.h>.
 +
  2012-10-22  Andreas Jaeger  <aj@suse.de>
  
  	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h (O_RSYNC): Define to