diff options
author | Jonathan Liu <net147@gmail.com> | 2014-10-20 16:28:55 +1100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-24 17:36:14 +0100 |
commit | 12769d73ffcbd4e2b38d070f8dd6ed315cda5be4 (patch) | |
tree | 27d802e85381064fa8ab755ed9eb4eeb8ffe5f17 | |
parent | 5269dfa0e61025bae0b059d7f188afec249e7baf (diff) | |
download | poky-12769d73ffcbd4e2b38d070f8dd6ed315cda5be4.tar.gz |
liburcu: revert ARM GCC blacklist commit
This fixes the following error when building liburcu:
"Your gcc version produces clobbered frame accesses"
OE-Core is using a patched GCC 4.8.2 which is able to compile liburcu
properly.
(From OE-Core rev: 83bb2c2b1f68abfc4d882b2aec3b5468372b1436)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch | 47 | ||||
-rw-r--r-- | meta/recipes-support/liburcu/liburcu_0.8.4.bb | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch b/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch new file mode 100644 index 0000000000..535a7384cb --- /dev/null +++ b/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 7b3df100346128d780f218b881d563d1fd12e310 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Mon, 20 Oct 2014 13:46:10 +1100 | ||
4 | Subject: [PATCH] Revert "Blacklist ARM gcc 4.8.0, 4.8.1, 4.8.2" | ||
5 | |||
6 | This reverts commit 4b79310aa3d408ba30fee02cc497a68072d38a99. | ||
7 | OE-Core is using a patched GCC 4.8.2 which is able to compile liburcu | ||
8 | properly. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE specific] | ||
11 | |||
12 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
13 | --- | ||
14 | urcu/compiler.h | 19 ------------------- | ||
15 | 1 file changed, 19 deletions(-) | ||
16 | |||
17 | diff --git a/urcu/compiler.h b/urcu/compiler.h | ||
18 | index 1e30903..19534f0 100644 | ||
19 | --- a/urcu/compiler.h | ||
20 | +++ b/urcu/compiler.h | ||
21 | @@ -108,23 +108,4 @@ | ||
22 | |||
23 | #define CAA_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | ||
24 | |||
25 | -/* | ||
26 | - * Don't allow compiling with buggy compiler. | ||
27 | - */ | ||
28 | - | ||
29 | -#ifdef __GNUC__ | ||
30 | -# define URCU_GCC_VERSION (__GNUC__ * 10000 \ | ||
31 | - + __GNUC_MINOR__ * 100 \ | ||
32 | - + __GNUC_PATCHLEVEL__) | ||
33 | - | ||
34 | -/* | ||
35 | - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 | ||
36 | - */ | ||
37 | -# ifdef __ARMEL__ | ||
38 | -# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802 | ||
39 | -# error Your gcc version produces clobbered frame accesses | ||
40 | -# endif | ||
41 | -# endif | ||
42 | -#endif | ||
43 | - | ||
44 | #endif /* _URCU_COMPILER_H */ | ||
45 | -- | ||
46 | 2.1.2 | ||
47 | |||
diff --git a/meta/recipes-support/liburcu/liburcu_0.8.4.bb b/meta/recipes-support/liburcu/liburcu_0.8.4.bb index cd7af24baa..963029ea73 100644 --- a/meta/recipes-support/liburcu/liburcu_0.8.4.bb +++ b/meta/recipes-support/liburcu/liburcu_0.8.4.bb | |||
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ | |||
8 | file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" | 8 | file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" |
9 | 9 | ||
10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ | 10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ |
11 | file://Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4" | 14 | SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4" |