[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r9782 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/hppa/ sysdeps/unix/sysv/linux/hppa/bits/
- To: commits@xxxxxxxxxx
- Subject: [commits] r9782 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/hppa/ sysdeps/unix/sysv/linux/hppa/bits/
- From: eglibc@xxxxxxxxxx
- Date: Tue, 02 Feb 2010 08:03:50 -0000
Author: eglibc
Date: Tue Feb 2 00:03:49 2010
New Revision: 9782
Log:
Import glibc-ports-mainline for 2010-02-02
Modified:
fsf/trunk/ports/ChangeLog.hppa
fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/Versions
fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/errno.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h
Modified: fsf/trunk/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Tue Feb 2 00:03:49 2010
@@ -1,3 +1,24 @@
+2010-02-01 Kyle McMartin <kyle@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/bits/socket.h: Fix value of
+ SOCK_CLOEXEC to match O_CLOEXEC.
+
+2010-02-01 Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/Versions: Bump
+ errlist-compat to 257 for GLIBC_2.12.
+ * sysdeps/unix/sysv/linux/hppa/bits/errno.h
+ (EOWNERDEAD): Define if not already defined.
+ (ENOTRECOVERABLE): Likewise.
+ (ERFKILL): Likewise.
+
+2009-11-29 Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h:
+ Rearrange file to reduce future maintenance.
+ [__USE_GNU]: Update F_GETOWN_EX, and F_SETOWN_EX.
+ Define f_owner_ex an __pid_type.
+
2009-11-25 Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/Versions
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/Versions (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/Versions Tue Feb 2 00:03:49 2010
@@ -23,6 +23,10 @@
GLIBC_2.11 {
fallocate64;
}
+ GLIBC_2.12 {
+ #errlist-compat 257
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
}
librt {
GLIBC_2.3 {
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/errno.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/errno.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/errno.h Tue Feb 2 00:03:49 2010
@@ -30,6 +30,18 @@
# define ECANCELED ECANCELLED
# endif
+# ifndef EOWNERDEAD
+# define EOWNERDEAD 254
+# endif
+
+# ifndef ENOTRECOVERABLE
+# define ENOTRECOVERABLE 255
+# endif
+
+# ifndef ERFKILL
+# define ERFKILL 256
+# endif
+
# ifndef __ASSEMBLER__
/* Function to get address of global `errno' variable. */
extern int *__errno_location (void) __THROW __attribute__ ((__const__));
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h Tue Feb 2 00:03:49 2010
@@ -1,6 +1,6 @@
/* O_*, F_*, FD_* bit values for Linux/HPPA.
Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2004
- Free Software Foundation, Inc.
+ 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
@@ -18,7 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _FCNTL_H
+#ifndef _FCNTL_H
# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
#endif
@@ -26,24 +26,25 @@
#ifdef __USE_GNU
# include <bits/uio.h>
#endif
+
/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
located on an ext2 file system */
-#define O_RDONLY 00000000
-#define O_WRONLY 00000001
-#define O_RDWR 00000002
-#define O_ACCMODE 00000003
+#define O_ACCMODE 0003
+#define O_RDONLY 00
+#define O_WRONLY 01
+#define O_RDWR 02
+#define O_CREAT 00000400 /* not fcntl */
+#define O_EXCL 00002000 /* not fcntl */
+#define O_NOCTTY 00400000 /* not fcntl */
+#define O_TRUNC 00001000 /* not fcntl */
#define O_APPEND 00000010
-#define O_BLKSEEK 00000100 /* HPUX only */
-#define O_CREAT 00000400 /* not fcntl */
-#define O_TRUNC 00001000 /* not fcntl */
-#define O_EXCL 00002000 /* not fcntl */
-#define O_ASYNC 00020000
-#define O_SYNC 00100000
#define O_NONBLOCK 00200004 /* HPUX has separate NDELAY & NONBLOCK */
#define O_NDELAY O_NONBLOCK
-#define O_NOCTTY 00400000 /* not fcntl */
-
+#define O_SYNC 00100000
+#define O_FSYNC O_SYNC
+#define O_ASYNC 020000
+#define O_BLKSEEK 00000100 /* HPUX only */
#ifdef __USE_GNU
# define O_DIRECT 000040000 /* Direct disk access. */
@@ -53,13 +54,16 @@
# define O_CLOEXEC 010000000 /* Set close_on_exec. */
#endif
-#ifdef __USE_LARGEFILE64
-# define O_LARGEFILE 00004000
-#endif
-
+/* For now Linux has synchronisity options for data and read operations.
+ We define the symbols here but let them do the same as O_SYNC since
+ this is a superset. */
#if defined __USE_POSIX199309 || defined __USE_UNIX98
# define O_DSYNC 01000000 /* HPUX only */
# define O_RSYNC 02000000 /* HPUX only */
+#endif
+
+#ifdef __USE_LARGEFILE64
+# define O_LARGEFILE 00004000
#endif
/* Values for the second argument to `fcntl'. */
@@ -70,11 +74,11 @@
#define F_SETFL 4 /* Set file status flags. */
#ifndef __USE_FILE_OFFSET64
# define F_GETLK 5 /* Get record locking info. */
-# define F_SETLK 6 /* Set record locking info (non-blocking). */
-# define F_SETLKW 7 /* Set record locking info (blocking). */
+# define F_SETLK 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW 7 /* Set record locking info (blocking). */
#else
-# define F_GETLK F_GETLK64 /* Get record locking info. */
-# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking). */
+# define F_GETLK F_GETLK64 /* Get record locking info. */
+# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/
# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
#endif
#define F_GETLK64 8 /* Get record locking info. */
@@ -89,19 +93,19 @@
#ifdef __USE_GNU
# define F_SETSIG 13 /* Set number of signal to be sent. */
# define F_GETSIG 14 /* Get number of signal to be sent. */
-# define F_GETOWN_EX 15
-# define F_SETOWN_EX 16
-#endif
-
-#ifdef __USE_GNU
-# define F_SETLEASE 1024 /* Set a lease. */
-# define F_GETLEASE 1025 /* Enquire what lease is active. */
-# define F_NOTIFY 1026 /* Request notfications on a directory. */
+# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */
+# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */
+#endif
+
+#ifdef __USE_GNU
+# define F_SETLEASE 1024 /* Set a lease. */
+# define F_GETLEASE 1025 /* Enquire what lease is active. */
+# define F_NOTIFY 1026 /* Request notfications on a directory. */
# define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
close-on-exit set. */
#endif
-/* for F_[GET|SET]FL */
+/* For F_[GET|SET]FD. */
#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
/* For posix fcntl() and `l_type' field of a `struct flock' for lockf(). */
@@ -109,12 +113,12 @@
#define F_WRLCK 2 /* Write lock. */
#define F_UNLCK 3 /* Remove lock. */
-/* for old implementation of bsd flock () */
+/* For old implementation of bsd flock(). */
#define F_EXLCK 4 /* or 3 */
#define F_SHLCK 8 /* or 4 */
#ifdef __USE_BSD
-/* operations for bsd flock(), also used by the kernel implementation */
+/* Operations for bsd flock(), also used by the kernel implementation. */
# define LOCK_SH 1 /* shared lock */
# define LOCK_EX 2 /* exclusive lock */
# define LOCK_NB 4 /* or'd with one of the above to prevent
@@ -123,19 +127,26 @@
#endif
#ifdef __USE_GNU
+# define LOCK_MAND 32 /* This is a mandatory flock: */
+# define LOCK_READ 64 /* ... which allows concurrent read operations. */
+# define LOCK_WRITE 128 /* ... which allows concurrent write operations. */
+# define LOCK_RW 192 /* ... Which allows concurrent read & write operations. */
+#endif
+
+#ifdef __USE_GNU
/* Types of directory notifications that may be requested with F_NOTIFY. */
-# define DN_ACCESS 0x00000001 /* File accessed. */
-# define DN_MODIFY 0x00000002 /* File modified. */
-# define DN_CREATE 0x00000004 /* File created. */
-# define DN_DELETE 0x00000008 /* File removed. */
-# define DN_RENAME 0x00000010 /* File renamed. */
-# define DN_ATTRIB 0x00000020 /* File changed attibutes. */
-# define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
+# define DN_ACCESS 0x00000001 /* File accessed. */
+# define DN_MODIFY 0x00000002 /* File modified. */
+# define DN_CREATE 0x00000004 /* File created. */
+# define DN_DELETE 0x00000008 /* File removed. */
+# define DN_RENAME 0x00000010 /* File renamed. */
+# define DN_ATTRIB 0x00000020 /* File changed attibutes. */
+# define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
#endif
struct flock
{
- short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
+ short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
short int l_whence; /* Where `l_start' is relative to (like `lseek'). */
#ifndef __USE_FILE_OFFSET64
__off_t l_start; /* Offset where the lock begins. */
@@ -150,11 +161,29 @@
#ifdef __USE_LARGEFILE64
struct flock64
{
- short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
+ short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
short int l_whence; /* Where `l_start' is relative to (like `lseek'). */
__off64_t l_start; /* Offset where the lock begins. */
__off64_t l_len; /* Size of the locked area; zero means until EOF. */
__pid_t l_pid; /* Process holding the lock. */
+ };
+#endif
+
+#ifdef __USE_GNU
+/* Owner types. */
+enum __pid_type
+ {
+ F_OWNER_TID = 0, /* Kernel thread. */
+ F_OWNER_PID, /* Process. */
+ F_OWNER_PGRP, /* Process group. */
+ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */
+ };
+
+/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */
+struct f_owner_ex
+ {
+ enum __pid_type type; /* Owner type of ID. */
+ __pid_t pid; /* ID of owner. */
};
#endif
@@ -172,13 +201,15 @@
#ifdef __USE_XOPEN2K
# define POSIX_FADV_NORMAL 0 /* No further special treatment. */
# define POSIX_FADV_RANDOM 1 /* Expect random page references. */
-# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references. */
+# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references. */
# define POSIX_FADV_WILLNEED 3 /* Will need these pages. */
# define POSIX_FADV_DONTNEED 4 /* Don't need these pages. */
# define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */
#endif
-#ifdef __USE_GNU
+
+#ifdef __USE_GNU
+/* Flags for SYNC_FILE_RANGE. */
# define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages
in the range before performing the
write. */
@@ -206,16 +237,18 @@
extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
__THROW;
+
/* 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);
+
/* Splice address range into a pipe. */
-extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,
+extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,
size_t __count, unsigned int __flags);
/* Splice two files together. */
-extern ssize_t splice (int __fdin, __off64_t *offin, int __fdout,
+extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len,
unsigned int __flags);
@@ -241,5 +274,5 @@
# endif
#endif
-
+
__END_DECLS
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/socket.h Tue Feb 2 00:03:49 2010
@@ -1,6 +1,6 @@
/* System-specific socket constants and types. Linux version.
- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
- Free Software Foundation, Inc.
+ Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009,
+ 2010 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
@@ -62,7 +62,7 @@
/* Flags to be ORed into the type parameter of socket and socketpair and
used for the flags parameter of paccept. */
- SOCK_CLOEXEC = 02000000, /* Atomically set close-on-exec flag for the
+ SOCK_CLOEXEC = 01000000, /* Atomically set close-on-exec flag for the
new descriptor(s). */
#define SOCK_CLOEXEC SOCK_CLOEXEC
#undef SOCK_NONBLOCK