about summary refs log tree commit diff
path: root/elf/dl-minimal.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-03-31 22:03:24 +0000
committerUlrich Drepper <drepper@redhat.com>2009-03-31 22:03:24 +0000
commit20739e5454c12acbc0479387fe795c5b19a4166f (patch)
treec919e6b6991686f97bac69910049a3e6325287ed /elf/dl-minimal.c
parentcb14424eb93499ba6e6dc8dba45ef6a58ce0a174 (diff)
downloadglibc-20739e5454c12acbc0479387fe795c5b19a4166f.tar.gz
glibc-20739e5454c12acbc0479387fe795c5b19a4166f.tar.xz
glibc-20739e5454c12acbc0479387fe795c5b19a4166f.zip
* elf/dl-load.c: Remove support for systems without MAP_ANON.
	* elf/dl-minimal.c: Likewise.
	* elf/dl-misc.c: Likewise.
	* elf/rtld.c: Likewise.
	* sysdeps/generic/ldsodefs.h: Likewise.
Diffstat (limited to 'elf/dl-minimal.c')
-rw-r--r--elf/dl-minimal.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index 5079c449f6..e07029326c 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -1,5 +1,5 @@
 /* Minimal replacements for basic facilities used in the dynamic linker.
-   Copyright (C) 1995-1998,2000-2002,2004-2006,2007
+   Copyright (C) 1995-1998,2000-2002,2004-2006,2007,2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -51,16 +51,6 @@ extern unsigned long int weak_function strtoul (const char *nptr,
 void * weak_function
 __libc_memalign (size_t align, size_t n)
 {
-#ifdef MAP_ANON
-#define	_dl_zerofd (-1)
-#else
-  extern int _dl_zerofd;
-
-  if (_dl_zerofd == -1)
-    _dl_zerofd = _dl_sysdep_open_zero_fill ();
-#define MAP_ANON 0
-#endif
-
   if (alloc_end == 0)
     {
       /* Consume any unused space in the last page of our data segment.  */
@@ -87,7 +77,7 @@ __libc_memalign (size_t align, size_t n)
 	  nup = GLRO(dl_pagesize);
 	}
       page = __mmap (0, nup, PROT_READ|PROT_WRITE,
-		     MAP_ANON|MAP_PRIVATE, _dl_zerofd, 0);
+		     MAP_ANON|MAP_PRIVATE, -1, 0);
       if (page == MAP_FAILED)
 	return NULL;
       if (page != alloc_end)