Most ports have the same exact mman bit defines, so let's unify things like the linux kernel has with the asm-generic efforts.
A few ports are left behind as they are non-trivial to merge -- the arch maintainers can tackle it if they care. Signed-off-by: Mike Frysinger <vap...@gentoo.org> --- i've omitted the files that were deleted entirely to cut down on noise libc/sysdeps/linux/arm/bits/mman.h | 103 ------------------------ libc/sysdeps/linux/avr32/bits/mman.h | 103 ------------------------ libc/sysdeps/linux/bfin/bits/mman.h | 96 ---------------------- libc/sysdeps/linux/common/bits/mman-common.h | 109 ++++++++++++++++++++++++++ libc/sysdeps/linux/common/bits/mman.h | 98 +----------------------- libc/sysdeps/linux/cris/bits/mman.h | 98 ----------------------- libc/sysdeps/linux/e1/bits/mman.h | 76 ------------------ libc/sysdeps/linux/frv/bits/mman.h | 76 ------------------ libc/sysdeps/linux/h8300/bits/mman.h | 76 ------------------ libc/sysdeps/linux/i386/bits/mman.h | 103 ------------------------ libc/sysdeps/linux/i960/bits/mman.h | 94 ---------------------- libc/sysdeps/linux/ia64/bits/mman.h | 102 +------------------------ libc/sysdeps/linux/m68k/bits/mman.h | 102 ------------------------ libc/sysdeps/linux/microblaze/bits/mman.h | 99 ----------------------- libc/sysdeps/linux/nios/bits/mman.h | 76 ------------------ libc/sysdeps/linux/nios2/bits/mman.h | 85 -------------------- libc/sysdeps/linux/sh/bits/mman.h | 103 ------------------------ libc/sysdeps/linux/sh64/bits/mman.h | 97 ----------------------- libc/sysdeps/linux/v850/bits/mman.h | 99 ----------------------- libc/sysdeps/linux/vax/bits/mman.h | 94 ---------------------- libc/sysdeps/linux/x86_64/bits/mman.h | 102 +------------------------ 21 files changed, 112 insertions(+), 1879 deletions(-) delete mode 100644 libc/sysdeps/linux/arm/bits/mman.h delete mode 100644 libc/sysdeps/linux/avr32/bits/mman.h delete mode 100644 libc/sysdeps/linux/bfin/bits/mman.h create mode 100644 libc/sysdeps/linux/common/bits/mman-common.h delete mode 100644 libc/sysdeps/linux/cris/bits/mman.h delete mode 100644 libc/sysdeps/linux/e1/bits/mman.h delete mode 100644 libc/sysdeps/linux/frv/bits/mman.h delete mode 100644 libc/sysdeps/linux/h8300/bits/mman.h delete mode 100644 libc/sysdeps/linux/i386/bits/mman.h delete mode 100644 libc/sysdeps/linux/i960/bits/mman.h delete mode 100644 libc/sysdeps/linux/m68k/bits/mman.h delete mode 100644 libc/sysdeps/linux/microblaze/bits/mman.h delete mode 100644 libc/sysdeps/linux/nios/bits/mman.h delete mode 100644 libc/sysdeps/linux/nios2/bits/mman.h delete mode 100644 libc/sysdeps/linux/sh/bits/mman.h delete mode 100644 libc/sysdeps/linux/sh64/bits/mman.h delete mode 100644 libc/sysdeps/linux/v850/bits/mman.h delete mode 100644 libc/sysdeps/linux/vax/bits/mman.h diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h new file mode 100644 index 0000000..f00cb1a --- /dev/null +++ b/libc/sysdeps/linux/common/bits/mman-common.h @@ -0,0 +1,109 @@ +/* Definitions for POSIX memory map interface. Linux/generic version. + Copyright (C) 1997,2000,2003,2005,2006,2009 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _SYS_MMAN_H +# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead." +#endif + +/* The following definitions basically come from the kernel headers. + But the kernel header is not namespace clean. */ + + +/* Protections are chosen from these bits, OR'd together. The + implementation does not necessarily support PROT_EXEC or PROT_WRITE + without PROT_READ. The only guarantees are that no writing will be + allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */ + +#define PROT_READ 0x1 /* Page can be read. */ +#define PROT_WRITE 0x2 /* Page can be written. */ +#define PROT_EXEC 0x4 /* Page can be executed. */ +#define PROT_NONE 0x0 /* Page can not be accessed. */ +#define PROT_GROWSDOWN 0x01000000 /* Extend change to start of + growsdown vma (mprotect only). */ +#define PROT_GROWSUP 0x02000000 /* Extend change to start of + growsup vma (mprotect only). */ + +/* Sharing types (must choose one and only one of these). */ +#define MAP_SHARED 0x01 /* Share changes. */ +#define MAP_PRIVATE 0x02 /* Changes are private. */ +#ifdef __USE_MISC +# define MAP_TYPE 0x0f /* Mask for type of mapping. */ +#endif + +/* Other flags. */ +#define MAP_FIXED 0x10 /* Interpret addr exactly. */ +#ifdef __USE_MISC +# define MAP_FILE 0 +# define MAP_ANONYMOUS 0x20 /* Don't use a file. */ +# define MAP_ANON MAP_ANONYMOUS +#endif + +/* These are Linux-specific. */ +#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_UNINITIALIZE 0x4000000 /* For anonymous mmap, memory could + be uninitialized. */ +#endif + +/* Flags to `msync'. */ +#define MS_ASYNC 1 /* Sync memory asynchronously. */ +#define MS_SYNC 4 /* Synchronous memory sync. */ +#define MS_INVALIDATE 2 /* Invalidate the caches. */ + +/* Flags for `mlockall'. */ +#define MCL_CURRENT 1 /* Lock all currently mapped pages. */ +#define MCL_FUTURE 2 /* Lock all additions to address + space. */ + +/* Flags for `mremap'. */ +#ifdef __USE_GNU +# define MREMAP_MAYMOVE 1 +# define MREMAP_FIXED 2 +#endif + +/* Advice to `madvise'. */ +#ifdef __USE_BSD +# define MADV_NORMAL 0 /* No further special treatment. */ +# define MADV_RANDOM 1 /* Expect random page references. */ +# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ +# define MADV_WILLNEED 3 /* Will need these pages. */ +# define MADV_DONTNEED 4 /* Don't need these pages. */ +# define MADV_REMOVE 9 /* Remove these pages and resources. */ +# define MADV_DONTFORK 10 /* Do not inherit across fork. */ +# define MADV_DOFORK 11 /* Do inherit across fork. */ +# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ +# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ +# define MADV_HWPOISON 100 /* Poison a page for testing. */ +#endif + +/* The POSIX people had to invent similar names for the same things. */ +#ifdef __USE_XOPEN2K +# define POSIX_MADV_NORMAL 0 /* No further special treatment. */ +# define POSIX_MADV_RANDOM 1 /* Expect random page references. */ +# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */ +# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ +# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ +#endif diff --git a/libc/sysdeps/linux/common/bits/mman.h b/libc/sysdeps/linux/common/bits/mman.h index 0c15902..11b8e2a 100644 --- a/libc/sysdeps/linux/common/bits/mman.h +++ b/libc/sysdeps/linux/common/bits/mman.h @@ -1,97 +1 @@ +#include <bits/mman-common.h> diff --git a/libc/sysdeps/linux/ia64/bits/mman.h b/libc/sysdeps/linux/ia64/bits/mman.h index a27a30f..a9d56ed 100644 --- a/libc/sysdeps/linux/ia64/bits/mman.h +++ b/libc/sysdeps/linux/ia64/bits/mman.h @@ -1,104 +1,4 @@ +#ifdef __USE_MISC +# define MAP_GROWSUP 0x00200 /* Register stack-like segment */ +#endif +#include <bits/mman-common.h> diff --git a/libc/sysdeps/linux/x86_64/bits/mman.h b/libc/sysdeps/linux/x86_64/bits/mman.h index 535c9ed..a0b7a0e 100644 --- a/libc/sysdeps/linux/x86_64/bits/mman.h +++ b/libc/sysdeps/linux/x86_64/bits/mman.h @@ -1,104 +1,4 @@ +#ifdef __USE_MISC +# define MAP_32BIT 0x40 /* Only give out 32-bit addresses. */ +#endif +#include <bits/mman-common.h> -- 1.6.5.3 _______________________________________________ uClibc mailing list uClibc@uclibc.org http://lists.busybox.net/mailman/listinfo/uclibc
