From: Po Lu <luangruo@yahoo.com>
Date: Sat, 6 May 2023 12:35:42 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11cb9cc598811ed36ba8aa2e5dafddeecaf95971;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/android
---

11cb9cc598811ed36ba8aa2e5dafddeecaf95971
diff --cc src/sysdep.c
index cb63d8bba08,443602a2d6d..bec2c00d3e5
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@@ -2078,11 -2020,13 +2080,16 @@@ init_signals (void
      {
        emacs_sigaction_init (&action, deliver_arith_signal);
        sigaction (SIGFPE, &action, 0);
+ #ifdef __vax__
+       /* NetBSD/vax generates SIGILL upon some floating point errors,
+ 	 such as taking the log of 0.0.  */
+       sigaction (SIGILL, &action, 0);
+ #endif /* __vax__ */
      }
  
 +  /* SIGUSR1 and SIGUSR2 are used internally by the android_select
 +     function.  */
 +#if !defined HAVE_ANDROID
  #ifdef SIGUSR1
    add_user_signal (SIGUSR1, "sigusr1");
  #endif