diff options
| author | Roy.Li <rongqing.li@windriver.com> | 2013-06-14 12:10:59 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-06-14 12:22:41 +0100 |
| commit | 6bb761e60925f121f8cd300ebca0ec482e63db43 (patch) | |
| tree | 0fdadc7ea6275786dbb70ddb80cd841c1e5b5be6 | |
| parent | c6171434e0ce905fee3a6ea22c804459d69c4524 (diff) | |
| download | cogl-6bb761e60925f121f8cd300ebca0ec482e63db43.tar.gz | |
cogl-fixed: Don't use inline ARM assembler when building for Thumb
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>
(cherry picked from commit 839cf49763cfe28f58b9e1ddb6282d8fbbe7a381)
| -rw-r--r-- | cogl/cogl-fixed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c index e3476057..7af659f2 100644 --- a/cogl/cogl-fixed.c +++ b/cogl/cogl-fixed.c @@ -629,7 +629,7 @@ cogl_fixed_sqrt (CoglFixed x) /* * 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 * to set the architecture defines correctly, and it is I think * very unlikely that anyone will want to use clutter on anything @@ -807,7 +807,7 @@ CoglFixed cogl_fixed_mul (CoglFixed a, CoglFixed b) { -#ifdef __arm__ +#ifdef __arm__ && !defined(__thumb__) /* This provides about 12% speedeup on the gcc -O2 optimised * C version * |