diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index a83456b386e1..6bc2ed581efa 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-07  Ian Lance Taylor  <iant@google.com>
+
+	PR target/46093
+	* generic-morestack.c (__generic_morestack): Make sure the segment
+	is large enough for both the stack frame and the copied
+	parameters.
+
 2011-10-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	PR bootstrap/49804
diff --git a/libgcc/generic-morestack.c b/libgcc/generic-morestack.c
index 7e29bbcf7481..0b660cedd5f2 100644
--- a/libgcc/generic-morestack.c
+++ b/libgcc/generic-morestack.c
@@ -512,7 +512,7 @@ __generic_morestack (size_t *pframe_size, void *old_stack, size_t param_size)
   current = *pp;
 
   if (current == NULL)
-    current = allocate_segment (frame_size);
+    current = allocate_segment (frame_size + param_size);
 
   current->old_stack = old_stack;