From 6afeac1289b92bc893613cc9efc9b5c692369e64 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sat, 23 Mar 2024 20:32:45 +0300 Subject: [PATCH] hurd: Disable Prefer_MAP_32BIT_EXEC on non-x86_64 for now While we could support it on any architecture, the tunable is currently only defined on x86_64. Signed-off-by: Sergey Bugaev Message-ID: <20240323173301.151066-5-bugaevc@gmail.com> --- sysdeps/mach/hurd/dl-sysdep.c | 2 +- sysdeps/mach/hurd/mmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 43129a1e74..6ba00e413d 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -457,7 +457,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) if (prot & PROT_EXEC) vmprot |= VM_PROT_EXECUTE; -#ifdef __LP64__ +#ifdef __x86_64__ if ((addr == NULL) && (prot & PROT_EXEC) && HAS_ARCH_FEATURE (Prefer_MAP_32BIT_EXEC)) flags |= MAP_32BIT; diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 7b94561015..30e369f067 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -60,7 +60,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) copy = ! (flags & MAP_SHARED); anywhere = ! (flags & MAP_FIXED); -#ifdef __LP64__ +#ifdef __x86_64__ if ((addr == NULL) && (prot & PROT_EXEC) && HAS_ARCH_FEATURE (Prefer_MAP_32BIT_EXEC)) flags |= MAP_32BIT;