This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.29.9000-112-gde71ee7
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Mar 2019 10:50:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.29.9000-112-gde71ee7
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via de71ee7b3c61dd26b78599da492b1168b31e70b6 (commit)
from ce6ddae03639529d5ca3a9eebb2d8b02bfd2ea97 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=de71ee7b3c61dd26b78599da492b1168b31e70b6
commit de71ee7b3c61dd26b78599da492b1168b31e70b6
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Mar 4 17:54:14 2019 +0100
elf: Remove remnants of MAP_ANON emulation
Most of the code was removed in commit
20739e5454c12acbc0479387fe795c5b19a4166f ("* elf/dl-load.c:
Remove support for systems without MAP_ANON.").
diff --git a/ChangeLog b/ChangeLog
index fb092ba..8e276de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* sysdeps/s390/s390-64/sysdep.h (ENTRY): Use alignment of 16byte.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 0e759cf..2bbef81 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -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'. */
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. */
if (r->r_state == RT_CONSISTENT)
{
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 37cab6f..a7f6b82 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -689,10 +689,6 @@ rtld_hidden_proto (_dl_starting_up)
/* Random data provided by the kernel. */
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
interpreted as for a `printf' call. All the lines start with a
tag showing the PID. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
elf/dl-load.c | 15 ---------------
sysdeps/generic/ldsodefs.h | 4 ----
3 files changed, 7 insertions(+), 19 deletions(-)
hooks/post-receive
--
GNU C Library master sources