diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-01-03 17:31:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 11:56:42 +0000 |
commit | 00f0d4ad649313e1a9ad2413d942cea78aa56348 (patch) | |
tree | 10545f2aaa95bb6c6eed90b86d87ee65b084c7fe /meta/recipes-graphics/clutter/cogl | |
parent | 87babb7894dff7e17a021d688af7ac898e3f48f4 (diff) | |
download | poky-00f0d4ad649313e1a9ad2413d942cea78aa56348.tar.gz |
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 <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/cogl')
-rw-r--r-- | meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch | 23 |
1 files changed, 23 insertions, 0 deletions
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 @@ | |||
1 | GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can | ||
2 | check this to turn off the use of 'clz' instructions, which otherwise would | ||
3 | cause compile errors like "selected processor does not support ARM mode | ||
4 | `clz r3,r0'". | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Wolfgang Denk <wd@denx.de> | ||
9 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | ||
10 | |||
11 | Index: cogl-1.8.2/cogl/cogl-fixed.c | ||
12 | =================================================================== | ||
13 | --- cogl-1.8.2.orig/cogl/cogl-fixed.c | ||
14 | +++ cogl-1.8.2/cogl/cogl-fixed.c | ||
15 | @@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x) | ||
16 | /* | ||
17 | * Find the highest bit set | ||
18 | */ | ||
19 | -#if defined (__arm__) | ||
20 | +#if defined (__arm__) && !defined(__ARM_ARCH_4T__) | ||
21 | /* This actually requires at least arm v5, but gcc does not seem | ||
22 | * to set the architecture defines correctly, and it is I think | ||
23 | * very unlikely that anyone will want to use clutter on anything | ||