diff --git a/core/recipes-kernel/lttng/liburcu/whitelist-sourcery-codebench-2013.11-32.patch b/core/recipes-kernel/lttng/liburcu/whitelist-sourcery-codebench-2013.11-32.patch deleted file mode 100644 index 9c831b8..0000000 --- a/core/recipes-kernel/lttng/liburcu/whitelist-sourcery-codebench-2013.11-32.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/urcu/compiler.h b/urcu/compiler.h -index 1e30903..f38e49c 100644 ---- a/urcu/compiler.h -+++ b/urcu/compiler.h -@@ -122,7 +122,19 @@ - */ - # ifdef __ARMEL__ - # if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802 --# error Your gcc version produces clobbered frame accesses -+# ifdef __CS_SOURCERYGXX_MAJ__ -+# if __CS_SOURCERYGXX_MAJ__ < 2013 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# if __CS_SOURCERYGXX_MAJ__ == 2013 && __CS_SOURCERYGXX_MIN__ < 11 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# if __CS_SOURCERYGXX_MAJ__ == 2013 && __CS_SOURCERYGXX_MIN__ == 11 && __CS_SOURCERYGXX_REV__ < 32 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# else -+# error Your gcc version produces clobbered frame accesses -+# endif - # endif - # endif - #endif diff --git a/core/recipes-kernel/lttng/liburcu_0.8.4.bb b/core/recipes-kernel/lttng/liburcu_0.8.4.bb index 149d265..29d9244 100644 --- a/core/recipes-kernel/lttng/liburcu_0.8.4.bb +++ b/core/recipes-kernel/lttng/liburcu_0.8.4.bb @@ -11,8 +11,6 @@ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4" SRC_URI[sha256sum] = "96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12" -SRC_URI_append_arm = " file://whitelist-sourcery-codebench-2013.11-32.patch" - S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" inherit autotools diff --git a/core/recipes-kernel/lttng/lttng-modules/whitelist-sourcery-codebench-2013.11-32.patch b/core/recipes-kernel/lttng/lttng-modules/whitelist-sourcery-codebench-2013.11-32.patch deleted file mode 100644 index 9d27da1..0000000 --- a/core/recipes-kernel/lttng/lttng-modules/whitelist-sourcery-codebench-2013.11-32.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: git/wrapper/compiler.h -=================================================================== ---- git.orig/wrapper/compiler.h 2014-02-17 17:49:58.336081938 +0500 -+++ git/wrapper/compiler.h 2014-02-17 18:13:37.632079922 +0500 -@@ -34,7 +34,19 @@ - */ - # ifdef __ARMEL__ - # if GCC_VERSION >= 40800 && GCC_VERSION <= 40802 --# error Your gcc version produces clobbered frame accesses -+# ifdef __CS_SOURCERYGXX_MAJ__ -+# if __CS_SOURCERYGXX_MAJ__ < 2013 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# if __CS_SOURCERYGXX_MAJ__ == 2013 && __CS_SOURCERYGXX_MIN__ < 11 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# if __CS_SOURCERYGXX_MAJ__ == 2013 && __CS_SOURCERYGXX_MIN__ == 11 && __CS_SOURCERYGXX_REV__ < 32 -+# error Sourcery CodeBench 2013.11-32 or higher is required -+# endif -+# else -+# error Your gcc version produces clobbered frame accesses -+# endif - # endif - # endif - #endif diff --git a/core/recipes-kernel/lttng/lttng-modules_2.4.0.bbappend b/core/recipes-kernel/lttng/lttng-modules_2.4.0.bbappend index eda3f50..7a97194 100644 --- a/core/recipes-kernel/lttng/lttng-modules_2.4.0.bbappend +++ b/core/recipes-kernel/lttng/lttng-modules_2.4.0.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_arm = " file://whitelist-sourcery-codebench-2013.11-32.patch" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|mips).*-linux' diff --git a/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch b/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch deleted file mode 100644 index 110f653..0000000 --- a/core/recipes-kernel/lttng/lttng-tools/compile-consumers-with-o1.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/common/consumer.c b/src/common/consumer.c -index ede214c..b10988b 100644 ---- a/src/common/consumer.c -+++ b/src/common/consumer.c -@@ -1,3 +1,5 @@ -+#pragma GCC optimize ("O1") -+ - /* - * Copyright (C) 2011 - Julien Desfossez - * Mathieu Desnoyers -diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c -index d15329f..78c7725 100644 ---- a/src/common/kernel-consumer/kernel-consumer.c -+++ b/src/common/kernel-consumer/kernel-consumer.c -@@ -1,3 +1,5 @@ -+#pragma GCC optimize ("O1") -+ - /* - * Copyright (C) 2011 - Julien Desfossez - * Mathieu Desnoyers -diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c -index 0955e66..0f8f75a 100644 ---- a/src/common/ust-consumer/ust-consumer.c -+++ b/src/common/ust-consumer/ust-consumer.c -@@ -1,3 +1,5 @@ -+#pragma GCC optimize ("O1") -+ - /* - * Copyright (C) 2011 - Julien Desfossez - * Mathieu Desnoyers diff --git a/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend b/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend deleted file mode 100644 index d7581b6..0000000 --- a/core/recipes-kernel/lttng/lttng-tools_2.4.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_arm = " file://compile-consumers-with-o1.patch"