diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 55b0b15f045..0152ec687ea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  1 19:53:27 CET 2000  Jan Hubicka  <jh@suse.cz>
+
+	* builtins.c (expand_builtin_memset): Expand for variable sized
+	lengths too.
+
 2000-02-01  David Billinghurst <David.Billinghurst@riotinto.com.au> 
 
 	* config/mips/iris6.h (SUBTARGET_ASM_SPEC) : Default ISA based
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 1ca5b5dbb5e..aaacc8decc1 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -1514,11 +1514,7 @@ expand_builtin_memset (exp)
       if (expand_expr (val, NULL_RTX, VOIDmode, 0) != const0_rtx)
 	return 0;
 
-      /* If LEN does not expand to a constant, don't do this
-	 operation in-line.  */
       len_rtx = expand_expr (len, NULL_RTX, VOIDmode, 0);
-      if (GET_CODE (len_rtx) != CONST_INT)
-	return 0;
 
       dest_mem = get_memory_rtx (dest);