diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8325d029bda9c9f4beb5fc90f06589a3dcf1acc4..64fa602f84382a4a76cfc8a18010c67754c1f141 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-30  Andrew Haley  <aph@redhat.com>
+
+	* flow.c (insn_dead_p): When using non-call-exceptions, don't 
+	eliminate insns that may trap.
+	* cse.c (insn_live_p): Likewise.
+
 2002-10-01  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/mips/mips.h (PROCESSOR_R4121): Rename to PROCESSOR_R4120.
diff --git a/gcc/cse.c b/gcc/cse.c
index 706fe80f4ebca2b9a30c128330a6fb99ee968289..29c771b93f6491ccf3835c48bbb848f6af9204e6 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -7582,7 +7582,9 @@ insn_live_p (insn, counts)
      int *counts;
 {
   int i;
-  if (GET_CODE (PATTERN (insn)) == SET)
+  if (flag_non_call_exceptions && may_trap_p (insn))
+    return true;
+  else if (GET_CODE (PATTERN (insn)) == SET)
     return set_live_p (PATTERN (insn), insn, counts);
   else if (GET_CODE (PATTERN (insn)) == PARALLEL)
     {
diff --git a/gcc/flow.c b/gcc/flow.c
index 2905917cbcc7960fbe20d937490b0bb99fed6bc8..d9e3ae3ce4022cd36ab16996868bf93a1bbdab08 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2110,6 +2110,10 @@ insn_dead_p (pbi, x, call_ok, notes)
 {
   enum rtx_code code = GET_CODE (x);
 
+  /* Don't eliminate insns that may trap.  */
+  if (flag_non_call_exceptions && may_trap_p (x))
+    return 0;
+
 #ifdef AUTO_INC_DEC
   /* As flow is invoked after combine, we must take existing AUTO_INC
      expressions into account.  */