From 20f2d51392b2c90c18b250210892931079a3a0b5 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 5 Jan 2012 20:09:44 +0000 Subject: [PATCH] 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 Signed-off-by: Joshua Lock Reviewed-by: Robert Bragg Reviewed-by: Emmanuele Bassi --- cogl/cogl-fixed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c index f56c28e36..7a00cb699 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