Name space hygeine for madvise.

diff --git a/ChangeLog b/ChangeLog
index c0726ea929209b6170c4740d517becb44296d65e..e24bcfeddfc155847dd663b4ab3df1579b50aa14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-10-04  Roland McGrath  <roland@hack.frob.com>
+
+       * misc/Versions (GLIBC_PRIVATE): New set, add __madvise.
+       * misc/madvise.c (madvise): Renamed to __madvise.
+       Make madvise a weak alias.
+       * include/sys/mman.h: Declare __madvise.
+       Replace libc_hidden_proto (madvise) with libc_hidden_proto (__madvise).
+       * sysdeps/unix/syscalls.list
+       (madvise): Make __madvise the strong name, and madvise a weak alias.
+       * sysdeps/unix/sysv/linux/syscalls.list
+       (madvise, mmap): Remove redundant entries.
+       * malloc/arena.c (shrink_heap): Use __madvise, not madvise.
+       * malloc/malloc.c (mtrim): Likewise.
+       * sysdeps/mach/hurd/malloc-machine.h (madvise): Renamed to __madvise.
+
 2012-10-03  Roland McGrath  <roland@hack.frob.com>
 
        * sysdeps/mach/hurd/dl-cache.c: File removed.

diff --git a/include/sys/mman.h b/include/sys/mman.h
index 0a0e4a6533df9cd9153004967935766c7cc02ee6..fd125ecb9c0fcdbcb83930cfc3a0d9e06f461675 100644 (file)
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -10,11 +10,12 @@ extern void *__mmap64 (void *__addr, size_t __len, int __prot,
 extern int __munmap (void *__addr, size_t __len);
 extern int __mprotect (void *__addr, size_t __len, int __prot);
 
+extern int __madvise (void *__addr, size_t __len, int __advice);
+libc_hidden_proto (__madvise)
+
 /* This one is Linux specific.  */
 extern void *__mremap (void *__addr, size_t __old_len,
                       size_t __new_len, int __flags, ...);
-
-libc_hidden_proto (madvise);
 #endif
 
 #endif

diff --git a/malloc/arena.c b/malloc/arena.c
index b209e3b7cd4432f31b6d4ebb7eba3ec6e0124291..eb9180eb9770ac7318390c4aa1b5565a6ebfcfff 100644 (file)
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -634,7 +634,7 @@ shrink_heap(heap_info *h, long diff)
       h->mprotect_size = new_size;
     }
   else
-    madvise ((char *)h + new_size, diff, MADV_DONTNEED);
+    __madvise ((char *)h + new_size, diff, MADV_DONTNEED);
   /*fprintf(stderr, "shrink %p %08lx\n", h, new_size);*/
 
   h->size = new_size;

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 892bc643429487002ce9c8eea70d2174ece8a309..3f0b6b1cd4b341ddc46c8a15213595f62bd66a76 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4450,7 +4450,7 @@ static int mtrim(mstate av, size_t pad)
                       content.  */
                    memset (paligned_mem, 0x89, size & ~psm1);
 #endif
-                   madvise (paligned_mem, size & ~psm1, MADV_DONTNEED);
+                   __madvise (paligned_mem, size & ~psm1, MADV_DONTNEED);
 
                    result = 1;
                  }

diff --git a/misc/Versions b/misc/Versions
index 7f525eaf5e02a77c1e4390cb96793b2b05a5560f..b2a91473da3cae2396a50b6e92364361e15fb800 100644 (file)
--- a/misc/Versions
+++ b/misc/Versions
@@ -149,4 +149,7 @@ libc {
   GLIBC_2.16 {
     __getauxval; getauxval;
   }
+  GLIBC_PRIVATE {
+    __madvise;
+  }
 }

diff --git a/misc/madvise.c b/misc/madvise.c
index 8f1c873c0683cfd18e5a066809e1e9dfc4c06b91..4e9681a521cc830ce928e3678a55c9d0c72b25dd 100644 (file)
--- a/misc/madvise.c
+++ b/misc/madvise.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1994,1995,1996,1997,2000,2007 Free Software Foundation, Inc.
+/* Advise system about intentions for a memory region.  Stub version.
+   Copyright (C) 1994-2012 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
@@ -23,11 +24,13 @@
    for the region starting at ADDR and extending LEN bytes.  */
 
 int
-madvise (__ptr_t addr, size_t len, int advice)
+__madvise (void *addr, size_t len, int advice)
 {
   __set_errno (ENOSYS);
   return -1;
 }
-libc_hidden_def (madvise)
+libc_hidden_def (__madvise)
+weak_alias (__madvise, madvise)
+
 stub_warning (madvise)
 #include <stub-tag.h>

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index afcf49188ade386800ebc607e678c761889b8be8..586e282cc69e54aed81f42c8ba2dd602b93a7ee6 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-04  Roland McGrath  <roland@hack.frob.com>
+
+       * pthread_create.c (start_thread): Use __madvise, not madvise.
+
 2012-10-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/i386/tls.h: Update copyright years.

diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 6ba9c6fe1170f532de3c2ac675cdad0432c106da..197dfa7855baf7e4913125006cae4d02a5690983 100644 (file)
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -399,7 +399,7 @@ start_thread (void *arg)
 #endif
   assert (freesize < pd->stackblock_size);
   if (freesize > PTHREAD_STACK_MIN)
-    madvise (pd->stackblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
+    __madvise (pd->stackblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
 
   /* If the thread is detached free the TCB.  */
   if (IS_DETACHED (pd))

diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h
index 4a8bd16e6cd7ffb8d016263eaba6740c5dc4bb4e..16e054fe5da3a65ca1d65b799083a6c7deef8297 100644 (file)
--- a/sysdeps/mach/hurd/malloc-machine.h
+++ b/sysdeps/mach/hurd/malloc-machine.h
@@ -66,8 +66,9 @@ __libc_tsd_define (static, void *, MALLOC)    /* declaration/common definition */
 
 #include <sys/mman.h>
 
-#undef madvise
-#define madvise(addr, len, advice)     ((void) (addr), (void) (len), (void) (advice))
+#undef __madvise
+#define __madvise(addr, len, advice)   \
+  ((void) (addr), (void) (len), (void) (advice))
 
 #include <sysdeps/generic/malloc-machine.h>
 

diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index b38b03e19b8069818a8f3bf52e82836915cc1683..46205825cae4131f93bc9480f6b961e7878164c6 100644 (file)
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -41,7 +41,7 @@ kill          -       kill            i:ii    __kill          kill
 link           -       link            i:ss    __link          link
 listen         -       listen          i:ii    __listen        listen
 lseek          -       lseek           i:iii   __libc_lseek    __lseek lseek
-madvise                -       madvise         i:pii   madvise
+madvise                -       madvise         i:pii   __madvise       madvise
 mkdir          -       mkdir           i:si    __mkdir         mkdir
 mmap           -       mmap            b:aniiii __mmap         mmap
 mprotect       -       mprotect        i:aii   __mprotect      mprotect

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 63432725d255bf51dab464a87fafda13e514e69e..2e6cf9c60d0dafa840a6f560a90a641565c62648 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -36,11 +36,9 @@ ioperm               -       ioperm          i:iii   ioperm
 iopl           -       iopl            i:i     iopl
 klogctl                EXTRA   syslog          i:isi   klogctl
 lchown         -       lchown          i:sii   __lchown        lchown
-madvise                -       madvise         i:pii   madvise
 mincore                -       mincore         i:anV   mincore
 mlock          -       mlock           i:bn    mlock
 mlockall       -       mlockall        i:i     mlockall
-mmap           -       mmap            b:aniiii        __mmap          mmap
 mount          EXTRA   mount           i:sssip __mount mount
 mremap         EXTRA   mremap          b:ainip __mremap        mremap
 munlock                -       munlock         i:ai    munlock