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.22-644-g38acf35
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Jan 2016 19:29:17 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-644-g38acf35
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 38acf35697c1bca396dedf7139995e6d0d4dd117 (commit)
from 084e7d57bbdeaeca3ea279600daefe2e614593b6 (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=38acf35697c1bca396dedf7139995e6d0d4dd117
commit 38acf35697c1bca396dedf7139995e6d0d4dd117
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jan 6 11:28:04 2016 -0800
Mark ld.so internal mmap functions hidden in ld.so
Since ld.so internal mmap functions are only used internally in ld.so,
they can be made hidden. Don't hide __mmap on Hurd, since __mmap in
ld.so will be preempted by the one in libc.so after bootstrap.
[BZ #19122]
* include/sys/mman.h [IS_IN (rtld)]: Include <dl-mman.h>.
* sysdeps/generic/dl-mman.h: New file.
* sysdeps/mach/hurd/dl-mman.h: Likewise.
diff --git a/ChangeLog b/ChangeLog
index 2ad1b5a..6c7fef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #19122]
+ * include/sys/mman.h [IS_IN (rtld)]: Include <dl-mman.h>.
+ * sysdeps/generic/dl-mman.h: New file.
+ * sysdeps/mach/hurd/dl-mman.h: Likewise.
+
2016-01-05 Joseph Myers <joseph@codesourcery.com>
* manual/texinfo.tex: Update to version 2016-01-04.21 with
diff --git a/include/sys/mman.h b/include/sys/mman.h
index fd125ec..7026f69 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -16,6 +16,10 @@ libc_hidden_proto (__madvise)
/* This one is Linux specific. */
extern void *__mremap (void *__addr, size_t __old_len,
size_t __new_len, int __flags, ...);
+
+# if IS_IN (rtld)
+# include <dl-mman.h>
+# endif
#endif
#endif
diff --git a/sysdeps/generic/dl-mman.h b/sysdeps/generic/dl-mman.h
new file mode 100644
index 0000000..9087218
--- /dev/null
+++ b/sysdeps/generic/dl-mman.h
@@ -0,0 +1,22 @@
+/* Functions with hidden attribute internal to ld.so, which are declared
+ in include/sys/mman.h. Generic version.
+ Copyright (C) 2015 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+extern __typeof (__mmap) __mmap attribute_hidden;
+extern __typeof (__mprotect) __mprotect attribute_hidden;
+extern __typeof (__munmap) __munmap attribute_hidden;
diff --git a/sysdeps/mach/hurd/dl-mman.h b/sysdeps/mach/hurd/dl-mman.h
new file mode 100644
index 0000000..f9d7996
--- /dev/null
+++ b/sysdeps/mach/hurd/dl-mman.h
@@ -0,0 +1,23 @@
+/* Functions with hidden attribute internal to ld.so, which are declared
+ in include/sys/mman.h. Hurd version.
+ Copyright (C) 2015 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Can't hide __mmap on Hurd, since __mmap in ld.so will be preempted by
+ the one in libc.so after bootstrap. */
+extern __typeof (__mprotect) __mprotect attribute_hidden;
+extern __typeof (__munmap) __munmap attribute_hidden;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
include/sys/mman.h | 4 ++++
.../bench-strchrnul.c => sysdeps/generic/dl-mman.h | 10 ++++++----
.../{generic/dl-librecon.h => mach/hurd/dl-mman.h} | 16 +++++++---------
4 files changed, 24 insertions(+), 13 deletions(-)
copy benchtests/bench-strchrnul.c => sysdeps/generic/dl-mman.h (68%)
copy sysdeps/{generic/dl-librecon.h => mach/hurd/dl-mman.h} (68%)
hooks/post-receive
--
GNU C Library master sources