diff --git a/src/acconfig.h b/src/acconfig.h
index c2a54d5b3425d0c4d119aedb1caea2f68e5919f7..524d70e2786c1a17450b1e6eec9eb8008cb4322a 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -1,5 +1,5 @@
 /*
- * $Id: acconfig.h,v 1.25 1998/05/29 20:41:39 grubba Exp $
+ * $Id: acconfig.h,v 1.26 1998/06/06 03:11:48 hubbe Exp $
  */
 #ifndef MACHINE_H
 #define MACHINE_H
@@ -38,6 +38,9 @@
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
+/* define this if igonoring SIGFPE helps with core dumps */
+#undef IGNORE_SIGFPE
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
diff --git a/src/configure.in b/src/configure.in
index e767b8e9fa158a89fbadf252503d4cb4e367a392..4ec8ccfa73ec13e0cef33c32acc331b86bd16a88 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.197 1998/06/04 13:12:17 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.198 1998/06/06 03:11:48 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -209,6 +209,7 @@ AC_DEFUN(AC_SYS_COMPILER_FLAG,
   if test x"[$]pike_cv_option_$2" = "xyes" ; then
     $3="[$]$3 $1"
     AC_MSG_RESULT(yes)
+    $5
   else
     AC_MSG_RESULT(no)
     $4
@@ -1565,6 +1566,95 @@ fi
 
 #############################################################################
 
+AC_MSG_CHECKING(if float conversion can cause SIGFPE)
+AC_CACHE_VAL(pike_cv_sys_idiot_sigfpe,
+[
+ AC_TRY_RUN([
+#include <math.h>
+
+int main(int argc, char **argv)
+{
+  float x=2.0,y=-128.0;
+  x=pow(2.0,-128.0);
+  if(x==3.0) exit(1);
+  exit(0);
+}
+],pike_cv_sys_idiot_sigfpe=no,pike_cv_sys_idiot_sigfpe=yes)
+])
+
+if test $pike_cv_sys_idiot_sigfpe = yes ; then
+  AC_MSG_RESULT(yes)
+
+ IEEE_FLAG=no
+ if test "x${GCC-}" = xyes ; then
+    AC_SYS_COMPILER_FLAG(-mieee, mieee, CFLAGS,[],IEEE_FLAG=yes)
+ else
+    AC_SYS_COMPILER_FLAG(-ieee, ieee, CFLAGS,[],IEEE_FLAG=yes)
+ fi
+ TEST_IGNORE_SIGFPE=yes
+
+ if test $IEEE_FLAG = yes; then
+AC_CACHE_VAL(pike_cv_sys_idiot_sigfpe_with_ieee,
+[
+ AC_TRY_RUN([
+#include <math.h>
+int main(int argc, char **argv)
+{
+
+  float x=2.0,y=-128.0;
+  x=pow(2.0,-128.0);
+  if(x==3.0) exit(1);
+  exit(0);
+}
+],pike_cv_sys_idiot_sigfpe_with_ieee=no,pike_cv_sys_idiot_sigfpe_with_ieee=yes)
+])
+   
+if test $pike_cv_sys_idiot_sigfpe_with_ieee = yes ; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  TEST_IGNORE_SIGFPE=no
+fi
+fi # IEEE_FLAG
+
+if test $TEST_IGNORE_SIGFPE = yes; then
+  AC_MSG_CHECKING(if ignoring SIGFPE helps)
+  AC_CACHE_VAL(pike_cv_sys_ignore_sigfpe,
+[
+AC_TRY_RUN([
+#include <math.h>
+int counter=0;
+RETSIGTYPE func(void)
+{
+ if(counter++>10) exit(7);
+ signal(SIGFPE,func);
+}
+
+int main(int argc, char **argv)
+{
+  float x=2.0,y=-128.0;
+  signal(SIGFPE,func);
+  x=pow(2.0,-128.0);
+  if(x==3.0) exit(1);
+  exit(0);
+}
+],pike_cv_sys_ignore_sigfpe=yes,pike_cv_sys_ignore_sigfpe=no)
+])
+
+if test "$pike_cv_sys_ignore_sigfpe" = yes; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(IGNORE_SIGFPE)
+else
+ AC_MSG_RESULT(no)
+fi
+fi # TEST_IGNORE_SIGFPE
+
+else
+ AC_MSG_RESULT(no)
+fi # pike_cv_sys_idiot_sigfpe
+
+#############################################################################
+
 define(float_check, [[
 #include <math.h>
 #define TY $1
diff --git a/src/signal_handler.c b/src/signal_handler.c
index 1cedf8c8a3729b0f96dc93fbf1c7d4658d8f039e..20ef39965bd64858c99fee9f9d94f2318260032f 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -22,7 +22,7 @@
 #include "builtin_functions.h"
 #include <signal.h>
 
-RCSID("$Id: signal_handler.c,v 1.66 1998/05/19 21:10:29 hubbe Exp $");
+RCSID("$Id: signal_handler.c,v 1.67 1998/06/06 03:11:48 hubbe Exp $");
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
@@ -1841,6 +1841,10 @@ void init_signals(void)
 #endif
 #endif
 
+#ifdef IGNORE_SIGFPE
+  my_signal(SIGFPE, SIG_IGN);
+#endif
+
   for(e=0;e<MAX_SIGNALS;e++)
     signal_callbacks[e].type=T_INT;