[cogl] build: Fix building clutter on armv4t devices
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] build: Fix building clutter on armv4t devices
- Date: Thu, 5 Jan 2012 20:16:35 +0000 (UTC)
commit 20f2d51392b2c90c18b250210892931079a3a0b5
Author: Joshua Lock <josh linux intel com>
Date: Thu Jan 5 20:09:44 2012 +0000
build: Fix building clutter on armv4t devices
GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we
can check this to turn off the use of 'clz' instructions, which
otherwise would cause compile errors like "selected processor does not
support ARM mode `clz r3,r0'".
Signed-off-by: Wolfgang Denk <wd denx de>
Signed-off-by: Joshua Lock <josh linux intel com>
Reviewed-by: Robert Bragg <robert linux intel com>
Reviewed-by: Emmanuele Bassi <ebassi linux intel com>
cogl/cogl-fixed.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c
index f56c28e..7a00cb6 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__)
+#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
/* 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]