Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for SerenityOS #689

Closed
wants to merge 2 commits into from
Closed

Fixes for SerenityOS #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e6fe9
Don't define MPROTECT_VDB for SerenityOS
linusg Dec 15, 2024
ed1af4f
Don't use madvise() on SerenityOS
linusg Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/private/gcconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,6 @@ extern int etext[], _end[];
# define DATASTART PTR_ALIGN_UP((ptr_t)etext, 0x1000)
# define DATAEND ((ptr_t)_end)
# define DYNAMIC_LOADING
# define MPROTECT_VDB
linusg marked this conversation as resolved.
Show resolved Hide resolved
# define USE_MMAP_ANON
#endif /* SERENITY */

Expand Down
8 changes: 3 additions & 5 deletions os_dep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2770,7 +2770,7 @@ block_unmap_inner(ptr_t start_addr, size_t len)
# ifdef SN_TARGET_PS3
ps3_free_mem(start_addr, len);
# elif defined(AIX) || defined(COSMO) || defined(CYGWIN32) \
|| defined(HPUX) || defined(SERENITY) \
|| defined(HPUX) \
|| (defined(LINUX) && !defined(PREFER_MMAP_PROT_NONE))
/* On AIX, mmap(PROT_NONE) fails with ENOMEM unless the */
/* environment variable XPG_SUS_ENV is set to ON. */
Expand Down Expand Up @@ -3259,8 +3259,7 @@ STATIC mach_port_t GC_task_self = 0;

# elif !defined(USE_WINALLOC)
# include <sys/mman.h>
# if !defined(AIX) && !defined(CYGWIN32) && !defined(HAIKU) \
&& !defined(SERENITY)
# if !defined(AIX) && !defined(CYGWIN32) && !defined(HAIKU)
# include <sys/syscall.h>
# endif

Expand Down Expand Up @@ -3377,8 +3376,7 @@ is_header_found_async(const void *p)
# elif defined(IRIX5)
# define CODE_OK (si->si_code == EACCES)
# elif defined(AIX) || defined(COSMO) || defined(CYGWIN32) \
|| defined(HAIKU) || defined(HURD) || defined(LINUX) \
|| defined(SERENITY)
|| defined(HAIKU) || defined(HURD) || defined(LINUX)
/* Linux: Empirically c.trapno == 14, on IA32, but is that useful? */
/* Should probably consider alignment issues on other architectures. */
# define CODE_OK TRUE
Expand Down
Loading