summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2013-07-03 17:13:23 +0100
committerNeil Roberts <neil@linux.intel.com>2013-07-04 12:05:53 +0100
commit43e389f3feb2dd4348b26b15627dc7d7e958197d (patch)
treececcc0fa1bd05331f15c41ea637e7d7928c5e77d
parentde04a14f501ce6e89edbfc3f3ca72128723582cb (diff)
downloadcogl-43e389f3feb2dd4348b26b15627dc7d7e958197d.tar.gz
Fix the check for whether to use inline ARM assembler
Commit 839cf49763cfe28 changed the inline ARM assembler so that it won't be used when targetting the Thumb instruction set. I manually applied the patch but I messed up the #if so it was generating a warning. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 823f254190abebdc2268e6e005b1f94c65a49ea2)
-rw-r--r--cogl/cogl-fixed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c
index 5dc74f8e..a144d840 100644
--- a/cogl/cogl-fixed.c
+++ b/cogl/cogl-fixed.c
@@ -807,7 +807,7 @@ CoglFixed
cogl_fixed_mul (CoglFixed a,
CoglFixed b)
{
-#ifdef __arm__ && !defined(__thumb__)
+#if defined(__arm__) && !defined(__thumb__)
/* This provides about 12% speedeup on the gcc -O2 optimised
* C version
*