Skip to content

Commit

Permalink
Mark ld.so internal mmap functions hidden in ld.so
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
H.J. Lu committed Jan 6, 2016
1 parent 084e7d5 commit 38acf35
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 0 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions include/sys/mman.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 22 additions & 0 deletions sysdeps/generic/dl-mman.h
Original file line number Diff line number Diff line change
@@ -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;
23 changes: 23 additions & 0 deletions sysdeps/mach/hurd/dl-mman.h
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 38acf35

Please sign in to comment.