From patchwork Tue Oct 20 13:37:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 9239 Received: (qmail 112685 invoked by alias); 20 Oct 2015 13:37:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 112669 invoked by uid 89); 20 Oct 2015 13:37:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f43.google.com MIME-Version: 1.0 X-Received: by 10.202.173.142 with SMTP id w136mr1831292oie.128.1445348220483; Tue, 20 Oct 2015 06:37:00 -0700 (PDT) In-Reply-To: <20151019222048.C537E2C3AD8@topped-with-meat.com> References: <1445189141-18068-1-git-send-email-hjl.tools@gmail.com> <20151019183113.29D732C3AA0@topped-with-meat.com> <20151019222048.C537E2C3AD8@topped-with-meat.com> Date: Tue, 20 Oct 2015 06:37:00 -0700 Message-ID: Subject: Re: [PATCH 1/3] Mark ld.so internel mmap functions hidden From: "H.J. Lu" To: Roland McGrath Cc: GNU C Library On Mon, Oct 19, 2015 at 3:20 PM, Roland McGrath wrote: > All new files should have a descriptive comment at the top. For any new > sysdeps file, the generic version should have clear comments saying what > the purpose of the file is and what sysdeps variants are expected to do. Here is the updated patch. OK for master? From 569475762b6e2caf8ffd253d48d27a9de7d5622d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 14 Oct 2015 15:14:15 -0700 Subject: [PATCH 1/2] 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 . * sysdeps/generic/dl-mman.h: New file. * sysdeps/mach/hurd/dl-mman.h: Likewise. --- include/sys/mman.h | 4 ++++ sysdeps/generic/dl-mman.h | 22 ++++++++++++++++++++++ sysdeps/mach/hurd/dl-mman.h | 23 +++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 sysdeps/generic/dl-mman.h create mode 100644 sysdeps/mach/hurd/dl-mman.h 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 +# 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 + . */ + +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 + . */ + +/* 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; -- 2.4.3