diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9096a40087..7f01f9e33c0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-14  Chandrakala Chavva  <cchavva@redhat.com>
+
+	* optabs.c (expand_complex_ab):: Use overflow-trapping optabs for
+	signed types if flag_trapv.
+
 2000-11-14  Zack Weinberg  <zack@wolery.stanford.edu>
 
 	* tradcpp.c, tradcif.y: Update FSF mailing address, delete
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 16433a9a3dc..5f046da9646 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -2505,7 +2505,8 @@ expand_complex_abs (mode, op0, target, unsignedp)
 
   /* Open-code the complex absolute-value operation
      if we can open-code sqrt.  Otherwise it's not worth while.  */
-  if (sqrt_optab->handlers[(int) submode].insn_code != CODE_FOR_nothing)
+  if (sqrt_optab->handlers[(int) submode].insn_code != CODE_FOR_nothing
+      && ! flag_trapv)
     {
       rtx real, imag, total;