X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsunos-os.c;h=fdf5a086d9ea3cf924d11a359b78acd48b5d7986;hb=3b3086ad5ad36a66302e1e6c5b7c8246c7963462;hp=8c1d9b493e368ba4cc4aa64300c7c96c5e13d5d8;hpb=d767105094f5836327f9389b061f83a44240a279;p=sbcl.git diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c index 8c1d9b4..fdf5a08 100644 --- a/src/runtime/sunos-os.c +++ b/src/runtime/sunos-os.c @@ -8,13 +8,13 @@ #include #include +#include "sbcl.h" #include "os.h" #include "arch.h" #include "interr.h" #include "interrupt.h" #include "globals.h" #include "validate.h" -#include "sbcl.h" #include "target-arch-os.h" #define OS_VM_DEFAULT_PAGESIZE 8192 @@ -50,9 +50,11 @@ void os_init(void) lose("sunos major version=%d (which isn't 5!)", major_version); } minor_version = atoi(name.release+2); - if ((minor_version == 8) || (minor_version == 9)) { + if ((minor_version == 8) || + (minor_version == 9) || + (minor_version == 10)) { KLUDGE_MAYBE_MAP_ANON = 0x100; - } else if (minor_version > 9) { + } else if (minor_version > 10) { FSHOW((stderr, "os_init: Solaris version greater than 9?\nUnknown MAP_ANON behaviour.\n")); lose("Unknown mmap() interaction with MAP_ANON"); } else { /* minor_version < 8 */ @@ -181,7 +183,7 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) addr = arch_get_bad_addr(signal, info, context); if(!interrupt_maybe_gc(signal, info, context)) { - if(!handle_control_stack_guard_triggered(context,addr)) + if(!handle_guard_page_triggered(context,addr)) interrupt_handle_now(signal, info, context); } }