merge from gcc

libiberty/ChangeLog

@@ -1,3 +1,7 @@
+2010-03-22  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_print_mod): Use () rather than [] for vectors.
+
 2010-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile.in (all): Do not use exec.

libiberty/cp-demangle.c

@@ -4506,9 +4506,9 @@ d_print_mod (struct d_print_info *dpi,
       d_print_comp (dpi, d_left (mod));
       return;
     case DEMANGLE_COMPONENT_VECTOR_TYPE:
-      d_append_string (dpi, " vector[");
+      d_append_string (dpi, " __vector(");
       d_print_comp (dpi, d_left (mod));
-      d_append_char (dpi, ']');
+      d_append_char (dpi, ')');
       return;
 
     default:

libiberty/testsuite/demangle-expected

@@ -3928,10 +3928,10 @@ _Z1fN1SUt_E
 f(S::{unnamed type#1})
 --format=gnu-v3
 _Z1fDv32_f
-f(float vector[32])
+f(float __vector(32))
 --format=gnu-v3
 _Z1fIfLi4EEvDv_T0__T_
-void f<float, 4>(float vector[4])
+void f<float, 4>(float __vector(4))
 --format=gnu-v3
 _Z1fI1AEDTclonplfp_fp_EET_
 decltype ((operator+)({parm#1}, {parm#1})) f<A>(A)