lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

elf: Remove remnants of MAP_ANON emulation

Browse Source 
Most of the code was removed in commit
20739e5454 ("* elf/dl-load.c:
Remove support for systems without MAP_ANON.").
This commit is contained in:
Florian Weimer
2019-03-04 17:54:14 +01:00
parent ce6ddae036
commit de71ee7b3c
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2019-03-04 Florian Weimer <fweimer@redhat.com>
* sysdeps/generic/ldsodefs.h (_dl_sysdep_open_zero_fill): Remove
declaration.
* elf/dl-load.c (_dl_map_object_from_fd): Assume MAP_ANON is
defined.
2019-03-04 Stefan Liebler <stli@linux.ibm.com> 2019-03-04 Stefan Liebler <stli@linux.ibm.com>
* sysdeps/s390/s390-64/sysdep.h (ENTRY): Use alignment of 16byte. * sysdeps/s390/s390-64/sysdep.h (ENTRY): Use alignment of 16byte.

15
elf/dl-load.c
View File

@ -947,21 +947,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
/* This is the ELF header. We read it in `open_verify'. */ /* This is the ELF header. We read it in `open_verify'. */
header = (void *) fbp->buf; header = (void *) fbp->buf;
#ifndef MAP_ANON
# define MAP_ANON 0
if (_dl_zerofd == -1)
{
_dl_zerofd = _dl_sysdep_open_zero_fill ();
if (_dl_zerofd == -1)
{
free (realname);
__close_nocancel (fd);
_dl_signal_error (errno, NULL, NULL,
N_("cannot open zero fill device"));
}
}
#endif
/* Signal that we are going to add new objects. */ /* Signal that we are going to add new objects. */
if (r->r_state == RT_CONSISTENT) if (r->r_state == RT_CONSISTENT)
{ {

4
sysdeps/generic/ldsodefs.h
View File

@ -689,10 +689,6 @@ rtld_hidden_proto (_dl_starting_up)
/* Random data provided by the kernel. */ /* Random data provided by the kernel. */
extern void *_dl_random attribute_hidden attribute_relro; extern void *_dl_random attribute_hidden attribute_relro;
/* OS-dependent function to open the zero-fill device. */
extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */
/* Write message on the debug file descriptor. The parameters are /* Write message on the debug file descriptor. The parameters are
interpreted as for a `printf' call. All the lines start with a interpreted as for a `printf' call. All the lines start with a
tag showing the PID. */ tag showing the PID. */