commit 4d54ce897cc8ad20f597acfd594438a3be98753f
author The Android Automerger <android-build@google.com> Wed Dec 10 06:10:03 2014 -0800
committer The Android Automerger <android-build@google.com> Wed Dec 10 06:10:03 2014 -0800
tree 7184a3c630afcb0b1a0048d25cf825e4905aaa1a
parent 99ac155aef9c2349d399360973c0e049cb92b906
parent c06433ff08e809c456d499e4ba26bc5681d4a271

merge in lmp-mr1-release history after reset to lmp-mr1-dev

src/opts/SkXfermode_opts_arm_neon.cpp

diff --git a/src/opts/SkXfermode_opts_arm_neon.cpp b/src/opts/SkXfermode_opts_arm_neon.cpp
index dca58eb..f6fbcd3 100644
--- a/src/opts/SkXfermode_opts_arm_neon.cpp
+++ b/src/opts/SkXfermode_opts_arm_neon.cpp
@@ -824,6 +824,7 @@
                    */
                   "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9",
                   "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18",
+                  "x30", /* x30 implicitly clobbered by blr */
                   "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17",
                   "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26",
                   "v27", "v28", "v29", "v30", "v31"