From: Andreas Gampe <agampe@google.com>
Date: Mon, 3 Aug 2015 17:25:06 +0000 (-0700)
Subject: ART: Fix stub_test
X-Git-Tag: android-x86-7.1-r1~889^2~630^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ff7b114aa660a169fbc48a35df87d1af85a54e60;p=android-x86%2Fart.git

ART: Fix stub_test

Clobber another register on arm32.

Change-Id: I0d355f69dfa7e6d86cb7c211f6ac2cb56f995d9d
---

diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc
index cf7db34ca..195b3b3d6 100644
--- a/runtime/arch/stub_test.cc
+++ b/runtime/arch/stub_test.cc
@@ -126,7 +126,7 @@ class StubTest : public CommonRuntimeTest {
           // Use the result from r0
         : [arg0] "r"(arg0), [arg1] "r"(arg1), [arg2] "r"(arg2), [code] "r"(code), [self] "r"(self),
           [referrer] "r"(referrer)
-        : "memory");  // clobber.
+        : "r0", "memory");  // clobber.
 #elif defined(__aarch64__)
     __asm__ __volatile__(
         // Spill x0-x7 which we say we don't clobber. May contain args.
@@ -479,7 +479,7 @@ class StubTest : public CommonRuntimeTest {
           // Use the result from r0
         : [arg0] "r"(arg0), [arg1] "r"(arg1), [arg2] "r"(arg2), [code] "r"(code), [self] "r"(self),
           [referrer] "r"(referrer), [hidden] "r"(hidden)
-        : "memory");  // clobber.
+        : "r0", "memory");  // clobber.
 #elif defined(__aarch64__)
     __asm__ __volatile__(
         // Spill x0-x7 which we say we don't clobber. May contain args.