[commits] r11257 - in /fsf/trunk/libc: ./ malloc/ nptl/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/i386/ sysdeps/unix/sysv/linux...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug 17 00:03:09 2010
New Revision: 11257

Log:
Import glibc-mainline for 2010-08-17

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/malloc/arena.c
    fsf/trunk/libc/malloc/malloc.c
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
    fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
    fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 17 00:03:09 2010
@@ -1,3 +1,15 @@
+2010-07-26  Anton Blanchard  <anton@xxxxxxxxx>
+
+	* malloc/malloc.c (sYSTRIm): Replace divide and multiply with mask.
+	* malloc/arena.c (heap_trim): Likewise.
+
+2010-08-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/syscalls.list: Add entry for fanotify_init
+	here.  Not...
+	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: ...here...
+	* sysdeps/unix/sysv/linux/i386/syscalls.list: ... orhere.
+
 2010-08-12  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	* sysdeps/i386/elf/Makefile: New file.

Modified: fsf/trunk/libc/malloc/arena.c
==============================================================================
--- fsf/trunk/libc/malloc/arena.c (original)
+++ fsf/trunk/libc/malloc/arena.c Tue Aug 17 00:03:09 2010
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2009
+   Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2009,2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@xxxxxxxxx>, 2001.
@@ -206,7 +206,7 @@
       return _int_malloc(&main_arena, sz);
     } else {
       if(top_check()<0)
-        return 0;
+	return 0;
       victim = _int_malloc(&main_arena, sz+1);
       return mem2mem_check(victim, sz);
     }
@@ -633,7 +633,7 @@
 /* There are platforms (e.g. Hurd) with a link-time hook mechanism. */
 #ifdef thread_atfork_static
 thread_atfork_static(ptmalloc_lock_all, ptmalloc_unlock_all, \
-                     ptmalloc_unlock_all2)
+		     ptmalloc_unlock_all2)
 #endif
 
 
@@ -660,7 +660,7 @@
   ptr = (heap->ar_ptr != (mstate)(heap+1)) ?
     (char*)(heap + 1) : (char*)(heap + 1) + sizeof(struct malloc_state);
   p = (mchunkptr)(((unsigned long)ptr + MALLOC_ALIGN_MASK) &
-                  ~MALLOC_ALIGN_MASK);
+		  ~MALLOC_ALIGN_MASK);
   for(;;) {
     fprintf(stderr, "chunk %p size %10lx", p, (long)p->size);
     if(p == top(heap->ar_ptr)) {
@@ -879,7 +879,7 @@
     /*check_chunk(ar_ptr, top_chunk);*/
   }
   top_size = chunksize(top_chunk);
-  extra = ((top_size - pad - MINSIZE + (pagesz-1))/pagesz - 1) * pagesz;
+  extra = (top_size - pad - MINSIZE - 1) & ~(pagesz - 1);
   if(extra < (long)pagesz)
     return 0;
   /* Try to shrink. */

Modified: fsf/trunk/libc/malloc/malloc.c
==============================================================================
--- fsf/trunk/libc/malloc/malloc.c (original)
+++ fsf/trunk/libc/malloc/malloc.c Tue Aug 17 00:03:09 2010
@@ -3466,7 +3466,7 @@
   top_size = chunksize(av->top);
 
   /* Release in pagesize units, keeping at least one page */
-  extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz;
+  extra = (top_size - pad - MINSIZE - 1) & ~(pagesz - 1);
 
   if (extra > 0) {
 

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Tue Aug 17 00:03:09 2010
@@ -1,6 +1,6 @@
 2010-08-12  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
-	* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.
+	* sysdeps/unix/sysv/linux/i386/Makefile: New file.
 
 2010-05-01  Alan Modra  <amodra@xxxxxxxxx>
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list Tue Aug 17 00:03:09 2010
@@ -9,5 +9,4 @@
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list Tue Aug 17 00:03:09 2010
@@ -101,3 +101,5 @@
 timerfd_create	EXTRA	timerfd_create	i:ii	timerfd_create
 timerfd_settime	EXTRA	timerfd_settime	i:iipp	timerfd_settime
 timerfd_gettime	EXTRA	timerfd_gettime	i:ip	timerfd_gettime
+
+fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init

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 Tue Aug 17 00:03:09 2010
@@ -19,5 +19,4 @@
 open		-	open		Ci:siv	__libc_open	__open open __open64 open64
 prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiis	fanotify_mark