SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs

Browse Source 
All these MAP_ symbols are always defined on supported FreeBSD versions
(12.2 and newer), so remove the #ifdefs since they aren't needed.

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
This commit is contained in:
Warner Losh 2021-09-16 18:37:21 -06:00
parent 26778ac3da
commit 36d5d89155
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bsd-user/mmap.c
View File

@ -286,13 +286,9 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size,
wrapped = repeat = 0; wrapped = repeat = 0;
prev = 0; prev = 0;
flags = MAP_ANONYMOUS | MAP_PRIVATE; flags = MAP_ANONYMOUS | MAP_PRIVATE;
#ifdef MAP_ALIGNED
if (alignment != 0) { if (alignment != 0) {
flags |= MAP_ALIGNED(alignment); flags |= MAP_ALIGNED(alignment);
} }
#else
/* XXX TODO */
#endif
for (;; prev = ptr) { for (;; prev = ptr) {
/* /*
@ -407,22 +403,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK)
>> MAP_ALIGNMENT_SHIFT); >> MAP_ALIGNMENT_SHIFT);
} }
#if MAP_GUARD
if (flags & MAP_GUARD) { if (flags & MAP_GUARD) {
printf("MAP_GUARD "); printf("MAP_GUARD ");
} }
#endif
if (flags & MAP_FIXED) { if (flags & MAP_FIXED) {
printf("MAP_FIXED "); printf("MAP_FIXED ");
} }
if (flags & MAP_ANONYMOUS) { if (flags & MAP_ANONYMOUS) {
printf("MAP_ANON "); printf("MAP_ANON ");
} }
#ifdef MAP_EXCL
if (flags & MAP_EXCL) { if (flags & MAP_EXCL) {
printf("MAP_EXCL "); printf("MAP_EXCL ");
} }
#endif
if (flags & MAP_PRIVATE) { if (flags & MAP_PRIVATE) {
printf("MAP_PRIVATE "); printf("MAP_PRIVATE ");
} }
@ -432,11 +424,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
if (flags & MAP_NOCORE) { if (flags & MAP_NOCORE) {
printf("MAP_NOCORE "); printf("MAP_NOCORE ");
} }
#ifdef MAP_STACK
if (flags & MAP_STACK) { if (flags & MAP_STACK) {
printf("MAP_STACK "); printf("MAP_STACK ");
} }
#endif
printf("fd=%d offset=0x%llx\n", fd, offset); printf("fd=%d offset=0x%llx\n", fd, offset);
} }
#endif #endif
@ -445,7 +435,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
errno = EINVAL; errno = EINVAL;
goto fail; goto fail;
} }
#ifdef MAP_STACK
if (flags & MAP_STACK) { if (flags & MAP_STACK) {
if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) !=
(PROT_READ | PROT_WRITE))) { (PROT_READ | PROT_WRITE))) {
@ -453,8 +442,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
goto fail; goto fail;
} }
} }
#endif /* MAP_STACK */
#ifdef MAP_GUARD
if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 || if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 ||
offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE | offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE |
/* MAP_PREFAULT | */ /* MAP_PREFAULT not in mman.h */ /* MAP_PREFAULT | */ /* MAP_PREFAULT not in mman.h */
@ -462,7 +449,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
errno = EINVAL; errno = EINVAL;
goto fail; goto fail;
} }
#endif
if (offset & ~TARGET_PAGE_MASK) { if (offset & ~TARGET_PAGE_MASK) {
errno = EINVAL; errno = EINVAL;