aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-01-06 11:28:04 -0800
committerH.J. Lu <hjl.tools@gmail.com>2016-01-06 11:28:56 -0800
commit38acf35697c1bca396dedf7139995e6d0d4dd117 (patch)
treed297b1dcc20d12b968fbd88b96472445dcd0b53b
parent084e7d57bbdeaeca3ea279600daefe2e614593b6 (diff)
downloadtermbaud-38acf35697c1bca396dedf7139995e6d0d4dd117.tar.gz
termbaud-38acf35697c1bca396dedf7139995e6d0d4dd117.tar.xz
termbaud-38acf35697c1bca396dedf7139995e6d0d4dd117.zip
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.
-rw-r--r--ChangeLog7
-rw-r--r--include/sys/mman.h4
-rw-r--r--sysdeps/generic/dl-mman.h22
-rw-r--r--sysdeps/mach/hurd/dl-mman.h23
4 files changed, 56 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ad1b5a3084..6c7fef4240e 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 fd125ecb9c0..7026f69f42a 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 00000000000..90872185082
--- /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 00000000000..f9d7996b6cb
--- /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;