From 61d8b5feeed36e242a043befe9b11f7f8c294f58 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 26 Sep 2018 12:33:14 +0000 Subject: Share MAP_* flags between more architectures. Continuing bits/mman.h unification between architectures using the Linux kernel, this patch arranges for the common set of MAP_* flags to be used by two more architectures. That common set is moved to bits/mman-map-flags-generic.h, which is included by bits/mman.h, to allow architectures to use that common set even if they also have architecture-specific additions to it. As well as the generic bits/mman.h, the versions for x86 and ia64 are also then made to include bits/mman-map-flags-generic.h, so while they still need architecture-specific bits/mman.h (for MAP_32BIT and MAP_GROWSUP respectively), they do not need to duplicate the generic flag definitions in there. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/bits/mman-map-flags-generic.h: New file. Most contents moved from .... * sysdeps/unix/sysv/linux/bits/mman.h: ... here. Move contents to and include . * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/mman-map-flags-generic.h. * sysdeps/unix/sysv/linux/ia64/bits/mman.h: Include . [__USE_MISC] (MAP_GROWSUP): Only define this macro, not other macros defined in . * sysdeps/unix/sysv/linux/x86/bits/mman.h: Include . [__USE_MISC] (MAP_32BIT): Only define this macro, not other macros defined in . --- .../unix/sysv/linux/bits/mman-map-flags-generic.h | 42 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/bits/mman.h | 19 ++-------- 2 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/bits/mman-map-flags-generic.h (limited to 'sysdeps/unix/sysv/linux/bits') diff --git a/sysdeps/unix/sysv/linux/bits/mman-map-flags-generic.h b/sysdeps/unix/sysv/linux/bits/mman-map-flags-generic.h new file mode 100644 index 0000000000..360584351e --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/mman-map-flags-generic.h @@ -0,0 +1,42 @@ +/* Definitions for POSIX memory map interface. Linux/generic version. + Copyright (C) 1997-2018 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 + . */ + +#ifndef _SYS_MMAN_H +# error "Never use directly; include instead." +#endif + +/* These definitions are appropriate for architectures that, in the + Linux kernel, either have no uapi/asm/mman.h, or have one that + includes asm-generic/mman.h without any changes to the values of + the MAP_* flags defined in that header. */ + +#ifdef __USE_MISC +# define MAP_GROWSDOWN 0x00100 /* Stack-like segment. */ +# define MAP_DENYWRITE 0x00800 /* ETXTBSY. */ +# define MAP_EXECUTABLE 0x01000 /* Mark it as an executable. */ +# define MAP_LOCKED 0x02000 /* Lock the mapping. */ +# define MAP_NORESERVE 0x04000 /* Don't check for reservations. */ +# define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */ +# define MAP_NONBLOCK 0x10000 /* Do not block on IO. */ +# define MAP_STACK 0x20000 /* Allocation is for a stack. */ +# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ +# define MAP_SYNC 0x80000 /* Perform synchronous page + faults for the mapping. */ +# define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED but do not unmap + underlying mapping. */ +#endif diff --git a/sysdeps/unix/sysv/linux/bits/mman.h b/sysdeps/unix/sysv/linux/bits/mman.h index e98b5204bf..178a8edd90 100644 --- a/sysdeps/unix/sysv/linux/bits/mman.h +++ b/sysdeps/unix/sysv/linux/bits/mman.h @@ -23,23 +23,10 @@ /* These definitions are appropriate for architectures that, in the Linux kernel, either have no uapi/asm/mman.h, or have one that includes asm-generic/mman.h without any changes or additions - relevant to glibc. */ + relevant to glibc. If there are additions relevant to glibc, an + architecture-specific bits/mman.h is needed. */ -#ifdef __USE_MISC -# define MAP_GROWSDOWN 0x00100 /* Stack-like segment. */ -# define MAP_DENYWRITE 0x00800 /* ETXTBSY. */ -# define MAP_EXECUTABLE 0x01000 /* Mark it as an executable. */ -# define MAP_LOCKED 0x02000 /* Lock the mapping. */ -# define MAP_NORESERVE 0x04000 /* Don't check for reservations. */ -# define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */ -# define MAP_NONBLOCK 0x10000 /* Do not block on IO. */ -# define MAP_STACK 0x20000 /* Allocation is for a stack. */ -# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ -# define MAP_SYNC 0x80000 /* Perform synchronous page - faults for the mapping. */ -# define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED but do not unmap - underlying mapping. */ -#endif +#include /* Include generic Linux declarations. */ #include -- cgit v1.2.3-70-g09d2