From 00f0d4ad649313e1a9ad2413d942cea78aa56348 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 3 Jan 2012 17:31:20 -0800 Subject: cogl: ensure we can build on armv4 Without this patch cogl will not build for armv4 as it uses an unsupported instruction. This changeset adds a patch from Wolfgang Denk to add an extra guard around armv5 or above code. (From OE-Core rev: e19586765af518892ed55d9bfd45d0857566ae98) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- .../clutter/cogl/build_for_armv4t.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch (limited to 'meta/recipes-graphics/clutter/cogl') diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch new file mode 100644 index 0000000000..36350854ee --- /dev/null +++ b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch @@ -0,0 +1,23 @@ +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: Submitted + +Signed-off-by: Wolfgang Denk +Signed-off-by: Joshua Lock + +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 -- cgit v1.2.3-54-g00ecf