Files
poky/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
Joshua Lock 0d7dfedca4 cogl: update upstream status for build_for_armv4t.patch
This has patch has been merged into upstreams git repository and will be
available in the next stable release.

(From OE-Core rev: 77f5e99a821ad30b859a402bdc55c495741b24cc)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-25 14:34:08 +00:00

24 lines
948 B
Diff

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'".
Upstream-Status: Accepted (should be in the next cogl stable release)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Index: cogl-1.8.2/cogl/cogl-fixed.c
===================================================================
--- cogl-1.8.2.orig/cogl/cogl-fixed.c
+++ cogl-1.8.2/cogl/cogl-fixed.c
@@ -626,7 +626,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