On Fri, Oct 8, 2021 at 4:24 PM Warner Losh <i...@bsdimp.com> wrote:
>
> 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 <i...@bsdimp.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Acked-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> bsd-user/mmap.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 4f4fa3ab46..6f33aec58b 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -286,13 +286,9 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start,
> abi_ulong size,
> wrapped = repeat = 0;
> prev = 0;
> flags = MAP_ANONYMOUS | MAP_PRIVATE;
> -#ifdef MAP_ALIGNED
> if (alignment != 0) {
> flags |= MAP_ALIGNED(alignment);
> }
> -#else
> - /* XXX TODO */
> -#endif
>
> 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)
> >> MAP_ALIGNMENT_SHIFT);
> }
> -#if MAP_GUARD
> if (flags & MAP_GUARD) {
> printf("MAP_GUARD ");
> }
> -#endif
> if (flags & MAP_FIXED) {
> printf("MAP_FIXED ");
> }
> if (flags & MAP_ANONYMOUS) {
> printf("MAP_ANON ");
> }
> -#ifdef MAP_EXCL
> if (flags & MAP_EXCL) {
> printf("MAP_EXCL ");
> }
> -#endif
> if (flags & 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) {
> printf("MAP_NOCORE ");
> }
> -#ifdef MAP_STACK
> if (flags & MAP_STACK) {
> printf("MAP_STACK ");
> }
> -#endif
> printf("fd=%d offset=0x%llx\n", fd, offset);
> }
> #endif
> @@ -445,7 +435,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
> prot,
> errno = EINVAL;
> goto fail;
> }
> -#ifdef MAP_STACK
> if (flags & MAP_STACK) {
> if ((fd != -1) || ((prot & (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;
> }
> }
> -#endif /* MAP_STACK */
> -#ifdef MAP_GUARD
> if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 ||
> offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE |
> /* 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;
> goto fail;
> }
> -#endif
>
> if (offset & ~TARGET_PAGE_MASK) {
> errno = EINVAL;
> --
> 2.32.0
>
>
Reviewed-by: Kyle Evans <kev...@freebsd.org>
