11 files changed, 8 insertions, 7 deletions
diff --git a/SOURCES b/SOURCES
index 07ce462..988cc8a 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,16 +1,17 @@
 Using built-in specs.
-COLLECT_GCC=/tmp/android-aarch64-4.9-2014-05-19/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64//bin/aarch64-linux-android-gcc
-COLLECT_LTO_WRAPPER=/tmp/android-aarch64-4.9-2014-05-19/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/../libexec/gcc/aarch64-linux-android/4.9/lto-wrapper
+COLLECT_GCC=/tmp/android-aarch64-4.9-2014-05-27/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64//bin/aarch64-linux-android-gcc
+COLLECT_LTO_WRAPPER=/tmp/android-aarch64-4.9-2014-05-27/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/../libexec/gcc/aarch64-linux-android/4.9/lto-wrapper
 Target: aarch64-linux-android
 Configured with: /tmp/AOSP-toolchain/build/../gcc/gcc-4.9/configure --prefix=/tmp/toolchain-build-aarch64-linux-4.9/prefix --target=aarch64-linux-android --host=x86_64-linux-gnu --build=x86_64-linux-gnu --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --with-mpfr=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --with-mpc=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --with-cloog=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --with-isl=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --with-ppl=/tmp/toolchain-build-aarch64-linux-4.9/temp-install --disable-ppl-version-check --disable-cloog-version-check --disable-isl-version-check --enable-cloog-backend=isl --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --enable-initfini-array --disable-nls --prefix=/tmp/toolchain-build-aarch64-linux-4.9/prefix --with-sysroot=/tmp/toolchain-build-aarch64-linux-4.9/prefix/sysroot --with-binutils-version=2.24 --with-mpfr-version=3.1.1 --with-mpc-version=1.0.1 --with-gmp-version=5.0.5 --with-gcc-version=4.9 --with-gdb-version=7.7 --with-gxx-include-dir=/tmp/toolchain-build-aarch64-linux-4.9/prefix/include/c++/4.9 --with-bugurl=http://source.android.com/source/report-bugs.html --disable-bootstrap --disable-libquadmath --enable-plugins --enable-libgomp --disable-libsanitizer --enable-gold --enable-graphite=yes --with-cloog-version=0.18.0 --with-isl-version=0.11.1 --enable-eh-frame-hdr-for-static --disable-gold --program-transform-name='s&^&aarch64-linux-android-&'
 Thread model: posix
 gcc version 4.9 20140514 (prerelease) (GCC) 
 
 gcc:
-commit 8c493ead6366b552adee796de296936b78f34c5a
-Author: Ben Cheng <bccheng@google.com>
+commit 8f2898c09773292b6ba523cee7e528a320ff1e02
+Merge: 41a5130 04ad5b9
+Author: Andrew Hsieh <andrewhsieh@google.com>
 
-    [4.9] Refresh GCC 4.9 to the 20140514 snapshot.
+    Merge "[4.8, 4.9] Fix aarch64/arm_neon.h vqdmulh_n_s16"
 
 binutils:
 commit e0bca373a85fa71b89d9ea42370433b3c0499b9d
diff --git a/aarch64-linux-android/lib64/libatomic.a b/aarch64-linux-android/lib64/libatomic.a
index 70ce8ce..5d49f22 100644
--- a/aarch64-linux-android/lib64/libatomic.a
+++ b/aarch64-linux-android/lib64/libatomic.a
diff --git a/aarch64-linux-android/lib64/libgomp.a b/aarch64-linux-android/lib64/libgomp.a
index a6a3ef2..56de8ea 100644
--- a/aarch64-linux-android/lib64/libgomp.a
+++ b/aarch64-linux-android/lib64/libgomp.a
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o b/lib/gcc/aarch64-linux-android/4.9/crtbegin.o
index 1eacd3a..141d0c6 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o
+++ b/lib/gcc/aarch64-linux-android/4.9/crtbegin.o
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o b/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o
index 2fc1f39..f290c17 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o
+++ b/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o b/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o
index 1eacd3a..141d0c6 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o
+++ b/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h b/lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h
index 747a292..b03d114 100644
--- a/lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h
+++ b/lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h
@@ -10111,7 +10111,7 @@ vqdmulh_n_s16 (int16x4_t a, int16_t b)
   int16x4_t result;
   __asm__ ("sqdmulh %0.4h,%1.4h,%2.h[0]"
            : "=w"(result)
-           : "w"(a), "w"(b)
+           : "w"(a), "x"(b)
            : /* No clobbers */);
   return result;
 }
@@ -10133,7 +10133,7 @@ vqdmulhq_n_s16 (int16x8_t a, int16_t b)
   int16x8_t result;
   __asm__ ("sqdmulh %0.8h,%1.8h,%2.h[0]"
            : "=w"(result)
-           : "w"(a), "w"(b)
+           : "w"(a), "x"(b)
            : /* No clobbers */);
   return result;
 }
diff --git a/lib/gcc/aarch64-linux-android/4.9/libgcc.a b/lib/gcc/aarch64-linux-android/4.9/libgcc.a
index b5a391f..fef109d 100644
--- a/lib/gcc/aarch64-linux-android/4.9/libgcc.a
+++ b/lib/gcc/aarch64-linux-android/4.9/libgcc.a
diff --git a/lib/gcc/aarch64-linux-android/4.9/libgcov.a b/lib/gcc/aarch64-linux-android/4.9/libgcov.a
index 5c3ebaa..7bf7657 100644
--- a/lib/gcc/aarch64-linux-android/4.9/libgcov.a
+++ b/lib/gcc/aarch64-linux-android/4.9/libgcov.a
diff --git a/libexec/gcc/aarch64-linux-android/4.9/cc1 b/libexec/gcc/aarch64-linux-android/4.9/cc1
index 397b6c9..c3208be 100755
--- a/libexec/gcc/aarch64-linux-android/4.9/cc1
+++ b/libexec/gcc/aarch64-linux-android/4.9/cc1
diff --git a/libexec/gcc/aarch64-linux-android/4.9/cc1plus b/libexec/gcc/aarch64-linux-android/4.9/cc1plus
index 58de825..47578d0 100755
--- a/libexec/gcc/aarch64-linux-android/4.9/cc1plus
+++ b/libexec/gcc/aarch64-linux-android/4.9/cc1plus