diff options
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index a477ec892ec..f8594d6a915 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -270,7 +270,7 @@ get_current_dir_name_or_unreachable (void) # if HAVE_GET_CURRENT_DIR_NAME && !BROKEN_GET_CURRENT_DIR_NAME # ifdef HYBRID_MALLOC - bool use_libc = bss_sbrk_did_unexec; + bool use_libc = will_dump_with_unexec_p (); # else bool use_libc = true; # endif @@ -1893,7 +1893,7 @@ handle_sigsegv (int sig, siginfo_t *siginfo, void *arg) /* Return true if we have successfully set up SIGSEGV handler on alternate stack. Otherwise we just treat SIGSEGV among the rest of fatal signals. */ -static bool +bool init_sigsegv (void) { struct sigaction sa; @@ -1908,12 +1908,15 @@ init_sigsegv (void) sigfillset (&sa.sa_mask); sa.sa_sigaction = handle_sigsegv; sa.sa_flags = SA_SIGINFO | SA_ONSTACK | emacs_sigaction_flags (); - return sigaction (SIGSEGV, &sa, NULL) < 0 ? 0 : 1; + if (sigaction (SIGSEGV, &sa, NULL) < 0) + return 0; + + return 1; } #else /* not HAVE_STACK_OVERFLOW_HANDLING or WINDOWSNT */ -static bool +bool init_sigsegv (void) { return 0; @@ -1963,7 +1966,7 @@ maybe_fatal_sig (int sig) } void -init_signals (bool dumping) +init_signals (void) { struct sigaction thread_fatal_action; struct sigaction action; @@ -2114,7 +2117,7 @@ init_signals (bool dumping) /* Don't alter signal handlers if dumping. On some machines, changing signal handlers sets static data that would make signals fail to work right when the dumped Emacs is run. */ - if (dumping) + if (will_dump_p ()) return; sigfillset (&process_fatal_action.sa_mask); |