[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r5680 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/alpha/bits/ nptl/sysdeps/unix/sysv/linux/bits/ nptl/sysdep...
- To: commits@xxxxxxxxxx
- Subject: [commits] r5680 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/alpha/bits/ nptl/sysdeps/unix/sysv/linux/bits/ nptl/sysdep...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 28 Mar 2008 07:03:42 -0000
Author: eglibc
Date: Fri Mar 28 00:03:41 2008
New Revision: 5680
Log:
Import glibc-mainline for 2008-03-28
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/local_lim.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/param.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sysconf.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Mar 28 00:03:41 2008
@@ -1,3 +1,25 @@
+2008-03-27 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Add open
+ and creat system calls.
+ * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove open system
+ call.
+ * sysdeps/unix/sysv/linux/ia64/syscalls.list: Remove open and creat
+ system calls.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
+
+2008-03-27 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefined ARG_MAX if
+ <linux/limits.h> has defined it.
+ * sysdeps/unix/sysv/linux/sys/param.h: Define NCARGS to the legacy
+ ARG_MAX value and prevent ARG_MAX from being defined by the kernel
+ headers.
+ * sysdeps/unix/sysv/linux/sysconf.c: Define legacy_ARG_MAX and use
+ it instead of ARG_MAX.
+
2008-03-25 Jakub Jelinek <jakub@xxxxxxxxxx>
* posix/gai.conf: Fix comment for scope nullbits.
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Mar 28 00:03:41 2008
@@ -1,3 +1,12 @@
+2008-03-27 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefined ARG_MAX if
+ <linux/limits.h> has defined it.
+ * sysdeps/unix/sysv/linux/alpha/bits/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/bits/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/local_lim.h: Likewise.
+
2008-03-18 Jakub Jelinek <jakub@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: Use __ASSEMBLER__ instead
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/Alpha version.
- Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2002-2004,2008 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
@@ -31,6 +31,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -49,6 +52,11 @@
#ifdef __undef_OPEN_MAX
# undef OPEN_MAX
# undef __undef_OPEN_MAX
+#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version.
- Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2002-2004,2008 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
@@ -31,6 +31,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -49,6 +52,11 @@
#ifdef __undef_OPEN_MAX
# undef OPEN_MAX
# undef __undef_OPEN_MAX
+#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/IA-64 version.
- Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2002-2004,2008 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
@@ -31,6 +31,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -49,6 +52,11 @@
#ifdef __undef_OPEN_MAX
# undef OPEN_MAX
# undef __undef_OPEN_MAX
+#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,6 @@
/* Minimum guaranteed maximum values for system limits. Linux/PPC version.
- Copyright (C) 1993-1998,2000,2002-2004,2006 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2002-2004,2006,2008
+ 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
@@ -31,6 +32,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -49,6 +53,11 @@
#ifdef __undef_OPEN_MAX
# undef OPEN_MAX
# undef __undef_OPEN_MAX
+#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/SPARC version.
- Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2002-2004,2008 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
@@ -31,6 +31,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -49,6 +52,11 @@
#ifdef __undef_OPEN_MAX
# undef OPEN_MAX
# undef __undef_OPEN_MAX
+#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/syscalls.list Fri Mar 28 00:03:41 2008
@@ -17,8 +17,6 @@
vfork - vfork 0 __vfork vfork
getpriority - getpriority i:ii __getpriority getpriority
-open - open Ci:siv __libc_open __open open !__libc_open64 __open64 open64
-open64 open -
# proper socket implementations:
accept - accept Ci:iBN __libc_accept __accept accept
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/local_lim.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/local_lim.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/local_lim.h Fri Mar 28 00:03:41 2008
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version.
- Copyright (C) 1993-1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1993-1998,2000,2003,2004,2008 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
@@ -31,6 +31,9 @@
#ifndef OPEN_MAX
# define __undef_OPEN_MAX
#endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
@@ -50,6 +53,11 @@
# undef OPEN_MAX
# undef __undef_OPEN_MAX
#endif
+/* Have to remove ARG_MAX? */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
+#endif
/* Maximum amount by which a process can descrease its asynchronous I/O
priority level. */
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/syscalls.list Fri Mar 28 00:03:41 2008
@@ -3,9 +3,6 @@
umount2 - umount 2 __umount2 umount2
getpriority - getpriority i:ii __getpriority getpriority
-
-creat - creat Ci:si __libc_creat creat creat64
-open - open Ci:siv __libc_open __open open __open64 open64
# semaphore and shm system calls
msgctl - msgctl i:iip __msgctl msgctl
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list Fri Mar 28 00:03:41 2008
@@ -1,5 +1,3 @@
# File name Caller Syscall name # args Strong name Weak names
-creat - creat Ci:si __libc_creat creat creat64
getrlimit - ugetrlimit i:ip __getrlimit getrlimit getrlimit64
-open - open Ci:siv __libc_open __open open __open64 open64
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list Fri Mar 28 00:03:41 2008
@@ -1,9 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names
vfork - vfork 0 __vfork vfork
-
-creat - creat Ci:si __libc_creat creat creat64
-open - open Ci:siv __libc_open __open open __open64 open64
# semaphore and shm system calls
msgctl - msgctl i:iip __msgctl msgctl
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/param.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/param.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/param.h Fri Mar 28 00:03:41 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2000,2001,2003,2008 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
@@ -19,9 +19,19 @@
#ifndef _SYS_PARAM_H
#define _SYS_PARAM_H 1
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
+
#include <limits.h>
#include <linux/limits.h>
#include <linux/param.h>
+
+/* The kernel headers defines ARG_MAX. The value is wrong, though. */
+#ifndef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
+#endif
/* BSD names for some <limits.h> values. */
@@ -31,12 +41,12 @@
#endif
#define MAXSYMLINKS 20
#define CANBSIZ MAX_CANON
-#define NCARGS ARG_MAX
#define MAXPATHLEN PATH_MAX
-/* The following is not really correct but it is a value we used for a
+/* The following are not really correct but it is a value we used for a
long time and which seems to be usable. People should not use NOFILE
- anyway. */
+ and NCARGS anyway. */
#define NOFILE 256
+#define NCARGS 131072
#include <sys/types.h>
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sysconf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sysconf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sysconf.c Fri Mar 28 00:03:41 2008
@@ -26,6 +26,11 @@
#include <sys/resource.h>
#include <not-cancel.h>
#include <ldsodefs.h>
+
+/* Legacy value of ARG_MAX. The macro is now not defined since the
+ actual value varies based on the stack size. */
+#define legacy_ARG_MAX 131072
+
static long int posix_sysconf (int name);
@@ -83,10 +88,10 @@
/* Use getrlimit to get the stack limit. */
struct rlimit rlimit;
if (__getrlimit (RLIMIT_STACK, &rlimit) == 0)
- return MAX (ARG_MAX, rlimit.rlim_cur / 4);
+ return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4);
}
- return ARG_MAX;
+ return legacy_ARG_MAX;
case _SC_NGROUPS_MAX:
/* Try to read the information from the /proc/sys/kernel/ngroups_max
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list Fri Mar 28 00:03:41 2008
@@ -15,3 +15,5 @@
readahead - readahead i:iii __readahead readahead
sendfile - sendfile i:iipi sendfile sendfile64
sync_file_range - sync_file_range i:iiii sync_file_range
+creat - creat Ci:si __libc_creat creat creat64
+open - open Ci:siv __libc_open __open open __open64 open64
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list Fri Mar 28 00:03:41 2008
@@ -1,13 +1,11 @@
# File name Caller Syscall name # args Strong name Weak names
arch_prctl EXTRA arch_prctl i:ii __arch_prctl arch_prctl
-creat - creat Ci:si __libc_creat creat creat64
modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
msgctl - msgctl i:iip __msgctl msgctl
msgget - msgget i:ii __msgget msgget
msgrcv - msgrcv Ci:ibnii __msgrcv msgrcv
msgsnd - msgsnd Ci:ibni __msgsnd msgsnd
-open - open Ci:siv __libc_open __open open __open64 open64
shmat - shmat i:ipi __shmat shmat
shmctl - shmctl i:iip __shmctl shmctl
shmdt - shmdt i:s __shmdt shmdt