Merge pull request #24 from pwoegere/master

Removal of obsolete workarounds no longer needed
This commit is contained in:
Noor-Ahsan
2014-04-08 13:22:42 +05:00
6 changed files with 0 additions and 85 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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'

View File

@@ -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 <julien.desfossez@polymtl.ca>
* Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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 <julien.desfossez@polymtl.ca>
* Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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 <julien.desfossez@polymtl.ca>
* Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

View File

@@ -1,2 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_append_arm = " file://compile-consumers-with-o1.patch"