[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r12169 - in /fsf/glibc-2_11-branch/libc: ./ elf/ manual/ nis/nss_compat/ nptl/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/li...
- To: commits@xxxxxxxxxx
- Subject: [commits] r12169 - in /fsf/glibc-2_11-branch/libc: ./ elf/ manual/ nis/nss_compat/ nptl/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/li...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 30 Nov 2010 08:08:07 -0000
Author: eglibc
Date: Tue Nov 30 00:08:05 2010
New Revision: 12169
Log:
Import glibc-2.11 for 2010-11-30
Modified:
fsf/glibc-2_11-branch/libc/.gitattributes
fsf/glibc-2_11-branch/libc/ChangeLog
fsf/glibc-2_11-branch/libc/INSTALL
fsf/glibc-2_11-branch/libc/elf/ldconfig.c
fsf/glibc-2_11-branch/libc/manual/install.texi
fsf/glibc-2_11-branch/libc/nis/nss_compat/compat-initgroups.c
fsf/glibc-2_11-branch/libc/nptl/ChangeLog
fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/i386/bits/mman.h
fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/sys/swap.h
fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
fsf/glibc-2_11-branch/libc/version.h
Modified: fsf/glibc-2_11-branch/libc/.gitattributes
==============================================================================
--- fsf/glibc-2_11-branch/libc/.gitattributes (original)
+++ fsf/glibc-2_11-branch/libc/.gitattributes Tue Nov 30 00:08:05 2010
@@ -1,1 +1,2 @@
timezone/* -whitespace
+INSTALL -whitespace
Modified: fsf/glibc-2_11-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_11-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_11-branch/libc/ChangeLog Tue Nov 30 00:08:05 2010
@@ -1,3 +1,30 @@
+2010-05-31 Petr Baudis <pasky@xxxxxxx>
+
+ [BZ #11149]
+ * elf/ldconfig.c (main): Allow aux_cache_file open()ing to fail
+ silently even in the chroot mode.
+
+2010-05-31 Petr Baudis <pasky@xxxxxxx>
+
+ [BZ #10085]
+ * nis/nss_compat/compat-initgroups.c (internal_getgrent_r): Fix
+ initialization of skip_initgroups_dyn.
+
+2010-09-27 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ [BZ #11611]
+ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
+ Mask out sign-bit copies when constructing f_fsid.
+
+2010-11-19 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/bits/mman.h: Define MAP_HUGETLB.
+ * sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
+
+2010-11-16 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
+
2010-11-11 Andreas Schwab <schwab@xxxxxxxxxx>
* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
Modified: fsf/glibc-2_11-branch/libc/INSTALL
==============================================================================
--- fsf/glibc-2_11-branch/libc/INSTALL (original)
+++ fsf/glibc-2_11-branch/libc/INSTALL Tue Nov 30 00:08:05 2010
@@ -461,3 +461,4 @@
errors or omissions in this manual, please report them to the bug
database. If you refer to specific sections of the manual, please
include the section names for easier identification.
+
Modified: fsf/glibc-2_11-branch/libc/elf/ldconfig.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/ldconfig.c (original)
+++ fsf/glibc-2_11-branch/libc/elf/ldconfig.c Tue Nov 30 00:08:05 2010
@@ -1359,14 +1359,9 @@
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
if (opt_chroot)
- {
- aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
- if (aux_cache_file == NULL)
- error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
- _PATH_LDCONFIG_AUX_CACHE);
- }
-
- if (! opt_ignore_aux_cache)
+ aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+
+ if (! opt_ignore_aux_cache && aux_cache_file)
load_aux_cache (aux_cache_file);
else
init_aux_cache ();
@@ -1376,7 +1371,8 @@
if (opt_build_cache)
{
save_cache (cache_file);
- save_aux_cache (aux_cache_file);
+ if (aux_cache_file)
+ save_aux_cache (aux_cache_file);
}
return 0;
Modified: fsf/glibc-2_11-branch/libc/manual/install.texi
==============================================================================
--- fsf/glibc-2_11-branch/libc/manual/install.texi (original)
+++ fsf/glibc-2_11-branch/libc/manual/install.texi Tue Nov 30 00:08:05 2010
@@ -348,11 +348,12 @@
Check the FAQ for any special compiler issues on particular platforms.
@item
-GNU @code{binutils} 2.15 or later
+GNU @code{binutils}
You must use GNU @code{binutils} (as and ld) to build the GNU C library.
No other assembler or linker has the necessary functionality at the
-moment.
+moment. The configure scripts checks for the appropriate version
+for the platform. Too-old versions will prevent building glibc.
@item
GNU @code{texinfo} 3.12f
Modified: fsf/glibc-2_11-branch/libc/nis/nss_compat/compat-initgroups.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/nis/nss_compat/compat-initgroups.c (original)
+++ fsf/glibc-2_11-branch/libc/nis/nss_compat/compat-initgroups.c Tue Nov 30 00:08:05 2010
@@ -474,17 +474,20 @@
/* If the selected module does not support getgrent_r or
initgroups_dyn, abort. We cannot find the needed group
entries. */
- if (nss_getgrent_r == NULL && nss_initgroups_dyn == NULL)
+ if (nss_initgroups_dyn == NULL || nss_getgrgid_r == NULL)
+ {
+ if (nss_setgrent != NULL)
+ {
+ nss_setgrent (1);
+ ent->need_endgrent = true;
+ }
+ ent->skip_initgroups_dyn = true;
+ }
+
+ if (ent->skip_initgroups_dyn && nss_getgrent_r == NULL)
return NSS_STATUS_UNAVAIL;
ent->files = false;
-
- if (nss_initgroups_dyn == NULL && nss_setgrent != NULL)
- {
- nss_setgrent (1);
- ent->need_endgrent = true;
- }
- ent->skip_initgroups_dyn = true;
return getgrent_next_nss (ent, buffer, buflen, user, group,
start, size, groupsp, limit, errnop);
Modified: fsf/glibc-2_11-branch/libc/nptl/ChangeLog
==============================================================================
--- fsf/glibc-2_11-branch/libc/nptl/ChangeLog (original)
+++ fsf/glibc-2_11-branch/libc/nptl/ChangeLog Tue Nov 30 00:08:05 2010
@@ -1,10 +1,3 @@
-2010-10-13 H.J. Lu <hongjiu.lu@xxxxxxxxx>
-
- [BZ #12113]
- * sysdeps/x86_64/pthreaddef.h (TCB_ALIGNMENT): Changed to 32.
- * sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Defined with alignment
- of "struct pthread".
-
2010-08-12 H.J. Lu <hongjiu.lu@xxxxxxxxx>
* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.
Modified: fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/i386/bits/mman.h
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/i386/bits/mman.h (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/i386/bits/mman.h Tue Nov 30 00:08:05 2010
@@ -1,5 +1,6 @@
/* Definitions for POSIX memory map interface. Linux/i386 version.
- Copyright (C) 1997,2000,2003,2005,2006,2009 Free Software Foundation, Inc.
+ Copyright (C) 1997,2000,2003,2005,2006,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
@@ -64,6 +65,7 @@
# define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */
# define MAP_NONBLOCK 0x10000 /* Do not block on IO. */
# define MAP_STACK 0x20000 /* Allocation is for a stack. */
+# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif
/* Flags to `msync'. */
Modified: fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/internal_statvfs.c (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/internal_statvfs.c Tue Nov 30 00:08:05 2010
@@ -214,7 +214,8 @@
buf->f_files = fsbuf->f_files;
buf->f_ffree = fsbuf->f_ffree;
if (sizeof (buf->f_fsid) == sizeof (fsbuf->f_fsid))
- buf->f_fsid = (fsbuf->f_fsid.__val[0]
+ buf->f_fsid = ((fsbuf->f_fsid.__val[0]
+ & ((1UL << (8 * sizeof (fsbuf->f_fsid.__val[0]))) - 1))
| ((unsigned long int) fsbuf->f_fsid.__val[1]
<< (8 * (sizeof (buf->f_fsid)
- sizeof (fsbuf->f_fsid.__val[0])))));
Modified: fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/sys/swap.h
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/sys/swap.h (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/sys/swap.h Tue Nov 30 00:08:05 2010
@@ -1,5 +1,5 @@
/* Calls to enable and disable swapping on specified locations. Linux version.
- Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998, 1999, 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
@@ -28,6 +28,7 @@
#define SWAP_FLAG_PREFER 0x8000 /* Set if swap priority is specified. */
#define SWAP_FLAG_PRIO_MASK 0x7fff
#define SWAP_FLAG_PRIO_SHIFT 0
+#define SWAP_FLAG_DISCARD 0x10000 /* Discard swap cluster after use. */
__BEGIN_DECLS
Modified: fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/x86_64/bits/mman.h (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/x86_64/bits/mman.h Tue Nov 30 00:08:05 2010
@@ -1,5 +1,5 @@
/* Definitions for POSIX memory map interface. Linux/x86_64 version.
- Copyright (C) 2001, 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2001,2003,2005,2006,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
@@ -65,6 +65,7 @@
# define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */
# define MAP_NONBLOCK 0x10000 /* Do not block on IO. */
# define MAP_STACK 0x20000 /* Allocation is for a stack. */
+# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif
/* Flags to `msync'. */
Modified: fsf/glibc-2_11-branch/libc/version.h
==============================================================================
--- fsf/glibc-2_11-branch/libc/version.h (original)
+++ fsf/glibc-2_11-branch/libc/version.h Tue Nov 30 00:08:05 2010
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
#define RELEASE "stable"
-#define VERSION "2.11.2"
+#define VERSION "2.11.3"