From: deanm@chromium.org <deanm@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Fri, 21 Aug 2009 17:17:35 +0000 (+0000)
Subject: Fix compliation on gcc-4.3 and ARMv5T
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~19427
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5ed395048275660239ba537413f0ba4882686d0;p=platform%2Fupstream%2FlibSkiaSharp.git

Fix compliation on gcc-4.3 and ARMv5T

 - smulbb is only on ARMv5TE and above (p316, ARM Architecture Reference Manual)
 - an empty clobber list causes a compiler error with my compiler, gcc-4.3.2

Patch by Joel Stanley <joel@jms.id.au>

Review URL: http://codereview.appspot.com/96165


git-svn-id: http://skia.googlecode.com/svn/trunk@329 2bbb7eff-a529-9590-31e7-b0007b416f81
---

diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 9198412..cf79e53 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -162,7 +162,10 @@ static inline int SkNextLog2(uint32_t value) {
     With this requirement, we can generate faster instructions on some
     architectures.
 */
-#if defined(__arm__) && !defined(__thumb__) && !defined(__ARM_ARCH_4__)
+#if defined(__arm__) \
+  && !defined(__thumb__) \
+  && !defined(__ARM_ARCH_4__) \
+  && !defined(__ARM_ARCH_5T__)
     static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
         SkASSERT((int16_t)x == x);
         SkASSERT((int16_t)y == y);
@@ -170,7 +173,6 @@ static inline int SkNextLog2(uint32_t value) {
         asm("smulbb %0, %1, %2 \n"
             : "=r"(product)
             : "r"(x), "r"(y)
-            :
             );
         return product;
     }