diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3dc994fb470..0bdef1cecaf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-10  Pedro Alves  <pedro@codesourcery.com>
+
+	* vec.h (VEC_block_remove): Place VEC_ASSERT_INFO on the right
+	side of the parenthesis.
+
+	Merge from GCC:
+	2010-07-13  Jakub Jelinek  <jakub@redhat.com>
+        * vec.h (VEC_block_remove): Fix comment.
+
 2011-02-08  Michael Snyder  <msnyder@vmware.com>
 
 	* linux-nat.c (linux_nat_filter_event): Fix typo in comment.
diff --git a/gdb/vec.h b/gdb/vec.h
index 2c383df7d87..b287170fc2f 100644
--- a/gdb/vec.h
+++ b/gdb/vec.h
@@ -353,10 +353,10 @@
    void VEC_T_block_remove (VEC(T) *v, unsigned ix, unsigned len);
 
    Remove LEN elements starting at the IXth.  Ordering is retained.
-   This is an O(1) operation.  */
+   This is an O(N) operation due to memmove.  */
 
 #define VEC_block_remove(T,V,I,L)	\
-	(VEC_OP(T,block_remove)(V,I,L) VEC_ASSERT_INFO)
+	(VEC_OP(T,block_remove)(V,I,L VEC_ASSERT_INFO))
 
 /* Get the address of the array of elements
    T *VEC_T_address (VEC(T) v)