Skip to content

Commit 86b6a78

Browse files
committed
fixup-nosigaction
1 parent 5013cea commit 86b6a78

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

src/engine/framework/System.cpp

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -392,20 +392,6 @@ static void CloseSingletonSocket()
392392
#endif
393393
}
394394

395-
#if defined(DAEMON_USE_FLOAT_EXCEPTIONS_AVAILABLE) && defined(__APPLE__)
396-
static void FloatingPointExceptionSignalHandler(int /* sig */, siginfo_t *sip, void* /* scp */)
397-
{
398-
#if defined(DAEMON_ARCH_arm64)
399-
if (sip->si_code == ILL_ILLTRP)
400-
{
401-
Sys::Error( "Illegal trap" );
402-
}
403-
#endif
404-
405-
Sys::Error( "Floating point exception" );
406-
}
407-
#endif
408-
409395
static void SetFloatingPointExceptions()
410396
{
411397
#if defined(DAEMON_USE_FLOAT_EXCEPTIONS_AVAILABLE)
@@ -511,16 +497,8 @@ static void SetFloatingPointExceptions()
511497

512498
fesetenv( &env );
513499

514-
struct sigaction act;
515-
act.sa_sigaction = FloatingPointExceptionSignalHandler;
516-
sigemptyset( &act.sa_mask );
517-
act.sa_flags = SA_SIGINFO;
518-
519-
#if defined(DAEMON_ARCH_amd64)
520-
sigaction(SIGFPE, &act, NULL);
521-
#elif defined(DAEMON_ARCH_arm64)
522-
sigaction(SIGILL, &act, NULL);
523-
#endif
500+
/* The signal is on SIGFPE on amd64 and on SIGILL on arm64.
501+
We already have some sigaction() in src/common/System.cpp. */
524502
#endif
525503

526504
// Superfluous on some systems, but always safe to do.

0 commit comments

Comments
 (0)