summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch13
-rw-r--r--meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch19
-rw-r--r--meta/recipes-support/liburcu/liburcu_0.9.3.bb (renamed from meta/recipes-support/liburcu/liburcu_0.9.2.bb)12
3 files changed, 12 insertions, 32 deletions
diff --git a/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch b/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch
index 690872b4a2..6296238b83 100644
--- a/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch
+++ b/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch
@@ -1,4 +1,4 @@
1From add566b913e1b5cd4974a2167157dc08d8245ab0 Mon Sep 17 00:00:00 2001 1From f37c5b56376d9bb506da68bb11d0d7463e6e563b Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de> 2From: Marek Vasut <marex@denx.de>
3Date: Tue, 9 Feb 2016 01:52:26 +0100 3Date: Tue, 9 Feb 2016 01:52:26 +0100
4Subject: [PATCH] Support for NIOS2 architecture 4Subject: [PATCH] Support for NIOS2 architecture
@@ -9,6 +9,7 @@ trivial too, since the CPU does not support SMP at all.
9 9
10Signed-off-by: Marek Vasut <marex@denx.de> 10Signed-off-by: Marek Vasut <marex@denx.de>
11Upstream-Status: Backport [ http://git.lttng.org/?p=userspace-rcu.git;a=commit;h=859050b3088aa3f0cb59d7f51ce24b9a0f18faa5 ] 11Upstream-Status: Backport [ http://git.lttng.org/?p=userspace-rcu.git;a=commit;h=859050b3088aa3f0cb59d7f51ce24b9a0f18faa5 ]
12
12--- 13---
13 LICENSE | 1 + 14 LICENSE | 1 +
14 README.md | 1 + 15 README.md | 1 +
@@ -44,12 +45,12 @@ index f6b290f..6fe9c1e 100644
44 - ia64 45 - ia64
45 - Sparcv9 32/64 46 - Sparcv9 32/64
46diff --git a/configure.ac b/configure.ac 47diff --git a/configure.ac b/configure.ac
47index 39a7777..71a7d71 100644 48index eebed56..8014e1d 100644
48--- a/configure.ac 49--- a/configure.ac
49+++ b/configure.ac 50+++ b/configure.ac
50@@ -124,6 +124,7 @@ AS_CASE([$host_cpu], 51@@ -136,6 +136,7 @@ AS_CASE([$host_cpu],
51 [arm*], [ARCHTYPE="arm"], 52 [arm*], [ARCHTYPE="arm"],
52 [aarch64], [ARCHTYPE="aarch64"], 53 [aarch64*], [ARCHTYPE="aarch64"],
53 [mips*], [ARCHTYPE="mips"], 54 [mips*], [ARCHTYPE="mips"],
54+ [nios2*], [ARCHTYPE="nios2"], 55+ [nios2*], [ARCHTYPE="nios2"],
55 [tile*], [ARCHTYPE="tile"], 56 [tile*], [ARCHTYPE="tile"],
@@ -57,7 +58,7 @@ index 39a7777..71a7d71 100644
57 [ARCHTYPE="unknown"] 58 [ARCHTYPE="unknown"]
58diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h 59diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h
59new file mode 100644 60new file mode 100644
60index 0000000..030d1bc 61index 0000000..b4f3e50
61--- /dev/null 62--- /dev/null
62+++ b/urcu/arch/nios2.h 63+++ b/urcu/arch/nios2.h
63@@ -0,0 +1,40 @@ 64@@ -0,0 +1,40 @@
@@ -140,5 +141,5 @@ index 0000000..5b3c303
140+ 141+
141+#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */ 142+#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */
142-- 143--
1432.7.0 1442.10.2
144 145
diff --git a/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch b/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch
deleted file mode 100644
index a10ccd7d8f..0000000000
--- a/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1liburcu: add support for aarch64_be
2
3Upstream-Status: Pending
4
5Signed-off-by: Tudor Florea <tudor.florea@enea.com>
6
7diff --git a/configure.ac b/configure.ac
8index 8ebfa8b..fe1c55d 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -121,7 +121,7 @@ AS_CASE([$host_cpu],
12 [alpha*], [ARCHTYPE="alpha"],
13 [ia64], [ARCHTYPE="ia64"],
14 [arm*], [ARCHTYPE="arm"],
15- [aarch64], [ARCHTYPE="aarch64"],
16+ [aarch64*], [ARCHTYPE="aarch64"],
17 [mips*], [ARCHTYPE="mips"],
18 [nios2*], [ARCHTYPE="nios2"],
19 [tile*], [ARCHTYPE="tile"],
diff --git a/meta/recipes-support/liburcu/liburcu_0.9.2.bb b/meta/recipes-support/liburcu/liburcu_0.9.3.bb
index 23fb8c4b42..4486e0abeb 100644
--- a/meta/recipes-support/liburcu/liburcu_0.9.2.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.9.3.bb
@@ -7,14 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \
7 file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ 7 file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \
8 file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" 8 file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b"
9 9
10SRC_URI = " \ 10SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
11 http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ 11 file://0001-Support-for-NIOS2-architecture.patch \
12 file://0001-Support-for-NIOS2-architecture.patch \ 12 "
13 file://0002-Support-for-aarch64_be.patch \
14 "
15 13
16SRC_URI[md5sum] = "49f86e68c1e2f41d303381a271b791d1" 14SRC_URI[md5sum] = "920970e35a1a2066c8353eabfeab8730"
17SRC_URI[sha256sum] = "8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3" 15SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006"
18 16
19S = "${WORKDIR}/userspace-rcu-${PV}" 17S = "${WORKDIR}/userspace-rcu-${PV}"
20CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" 18CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"