brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-fixed: Don't use inline ARM assembler when building for Thumb

Browse Source 
There are two asm() statements in cogl-fixed.c that can't be assembled
in Thumb mode. This patch switches it to the generic code in Thumb
mode.

Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Roy.Li 2013-06-14 12:10:59 +01:00 committed by Neil Roberts
parent 1b1713625c
commit 839cf49763
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl-fixed.c
View File

@ -629,7 +629,7 @@ cogl_fixed_sqrt (CoglFixed x)
/* /*
* Find the highest bit set * Find the highest bit set
*/ */
#if defined (__arm__) && !defined(__ARM_ARCH_4T__) #if defined (__arm__) && !defined(__ARM_ARCH_4T__) && !defined(__thumb__)
/* This actually requires at least arm v5, but gcc does not seem /* This actually requires at least arm v5, but gcc does not seem
* to set the architecture defines correctly, and it is I think * to set the architecture defines correctly, and it is I think
* very unlikely that anyone will want to use clutter on anything * very unlikely that anyone will want to use clutter on anything
@ -807,7 +807,7 @@ CoglFixed
cogl_fixed_mul (CoglFixed a, cogl_fixed_mul (CoglFixed a,
CoglFixed b) CoglFixed b)
{ {
#ifdef __arm__ #ifdef __arm__ && !defined(__thumb__)
/* This provides about 12% speedeup on the gcc -O2 optimised /* This provides about 12% speedeup on the gcc -O2 optimised
* C version * C version
* *