[commits] r9424 - in /trunk: libc/ ports/ ports/sysdeps/unix/sysv/linux/alpha/bits/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Dec  7 13:56:24 2009
New Revision: 9424

Log:
Merge changes between r9378 and r9423 from /fsf/trunk.

Modified:
    trunk/libc/.gitignore
    trunk/ports/ChangeLog.alpha
    trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
    trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h
    trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h

Modified: trunk/libc/.gitignore
==============================================================================
--- trunk/libc/.gitignore (original)
+++ trunk/libc/.gitignore Mon Dec  7 13:56:24 2009
@@ -1,14 +1,4 @@
 *~
-*.d
-*.o
-*.so
-*.po
-*.go
-*.bo
-stamp.*
-*.stamp
-*.ustamp
-*.udeps
 *.gz
 *.Z
 *.tar

Modified: trunk/ports/ChangeLog.alpha
==============================================================================
--- trunk/ports/ChangeLog.alpha (original)
+++ trunk/ports/ChangeLog.alpha Mon Dec  7 13:56:24 2009
@@ -1,3 +1,19 @@
+2009-11-23  Matt Turner  <mattst88@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Use struct timespec
+	for timestamps also if __USE_XOPEN2K8.
+
+2009-11-23  Matt Turner  <mattst88@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Change misleading
+	names of parameters of sync_file_range.
+
+2009-11-23  Matt Turner  <mattst88@xxxxxxxxx>
+
+	[BZ #10972]
+	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Add new MADV_*
+	constants from recent kernels.
+
 2009-11-10  Matt Turner  <mattst88@xxxxxxxxx>
 
 	[BZ #10609]

Modified: trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h Mon Dec  7 13:56:24 2009
@@ -210,7 +210,7 @@
 
 
 /* Selective file content synch'ing.  */
-extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,
+extern int sync_file_range (int __fd, __off64_t __offset, __off64_t __count,
 			    unsigned int __flags);
 
 

Modified: trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/mman.h Mon Dec  7 13:56:24 2009
@@ -1,5 +1,6 @@
 /* Definitions for POSIX memory map interface.  Linux/Alpha version.
-   Copyright (C) 1997, 1998, 2000, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2003, 2006, 2009
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -91,14 +92,17 @@
 
 /* Advice to `madvise'.  */
 #ifdef __USE_BSD
-# define MADV_NORMAL     0	/* No further special treatment.  */
-# define MADV_RANDOM     1	/* Expect random page references.  */
-# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
-# define MADV_WILLNEED   3	/* Will need these pages.  */
-# define MADV_DONTNEED   6	/* Don't need these pages.  */
-# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
-# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
-# define MADV_DOFORK	 11	/* Do inherit across fork.  */
+# define MADV_NORMAL      0  /* No further special treatment.  */
+# define MADV_RANDOM      1  /* Expect random page references.  */
+# define MADV_SEQUENTIAL  2  /* Expect sequential page references.  */
+# define MADV_WILLNEED    3  /* Will need these pages.  */
+# define MADV_DONTNEED    6  /* Don't need these pages.  */
+# define MADV_REMOVE      9  /* Remove these pages and resources.  */
+# define MADV_DONTFORK    10 /* Do not inherit across fork.  */
+# define MADV_DOFORK      11 /* Do inherit across fork.  */
+# define MADV_MERGEABLE   12 /* KSM may merge identical pages.  */
+# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages.  */
+# define MADV_HWPOISON   100 /* Poison a page for testing.  */
 #endif
 
 /* The POSIX people had to invent similar names for the same things.  */

Modified: trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h Mon Dec  7 13:56:24 2009
@@ -41,7 +41,7 @@
 
    Use neat tidy anonymous unions and structures when possible.  */
 
-#ifdef __USE_MISC
+#if defined __USE_MISC || defined __USE_XOPEN2K8
 # if __GNUC_PREREQ(3,3)
 #  define __ST_TIME(X)				\
 	__extension__ union {			\