r213063 - in /branches/google/gcc-4_9: gcc/conf...

[xur@gcc.gnu.org]

Author: xur
Date: Fri Jul 25 21:23:59 2014
New Revision: 213063

URL: https://gcc.gnu.org/viewcvs?rev=213063&root=gcc&view=rev
Log:
2014-07-25  Rong Xu  <xur@google.com>

	* libstdc++-v3/config/locale/generic/c_locale.h: Fix bad merge.
	* gcc/config/aarch64/arm_neon.h (vqdmulh_n_s32): Ditto.
	(vqdmulhq_n_s32): Ditto.

Modified:
    branches/google/gcc-4_9/libstdc++-v3/config/locale/generic/c_locale.h

Changes in other areas also in this revision:
Modified:
    branches/google/gcc-4_9/gcc/config/aarch64/arm_neon.h