diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b6a01d898e3..6e28d8614192 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-05  Richard Guenther  <rguenther@suse.de>
+
+	* fold-const.c (fold_binary): Remove duplicate folding
+	of comparison of non-null ADDR_EXPR against null.
+
 2007-03-05  Richard Guenther  <rguenther@suse.de>
 	Dorit Nuzman  <dorit@il.ibm.com>
 
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index dab2647ee288..4d59f71111c3 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11159,14 +11159,6 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
           && code == EQ_EXPR)
         return fold_build1 (TRUTH_NOT_EXPR, type, arg0);
 
-      /* If this is an equality comparison of the address of a non-weak
-	 object against zero, then we know the result.  */
-      if (TREE_CODE (arg0) == ADDR_EXPR
-	  && VAR_OR_FUNCTION_DECL_P (TREE_OPERAND (arg0, 0))
-	  && ! DECL_WEAK (TREE_OPERAND (arg0, 0))
-	  && integer_zerop (arg1))
-	return constant_boolean_node (code != EQ_EXPR, type);
-
       /* If this is an equality comparison of the address of two non-weak,
 	 unaliased symbols neither of which are extern (since we do not
 	 have access to attributes for externs), then we know the result.  */