diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-06-16 14:51:06 +0300 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 15:52:18 +0100 | 
| commit | a64f49ba80fc4228f7f7dd3d43bad56a34b8922c (patch) | |
| tree | b9e9026b309e7a8e0ecc7c2efe97b3c416f1c479 | |
| parent | d5d7b49cc5515ad4cee03b52e5af6d3f611c0cee (diff) | |
| download | poky-a64f49ba80fc4228f7f7dd3d43bad56a34b8922c.tar.gz | |
liburcu: update to 0.10.0
Drop backported patch.
Update paths to files that establish the licensing.
(From OE-Core rev: 40e0ca5902981388398f0e12537897233b5b4f07)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 17 insertions, 163 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 deleted file mode 100644 index 6296238b83..0000000000 --- a/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch +++ /dev/null | |||
| @@ -1,145 +0,0 @@ | |||
| 1 | From f37c5b56376d9bb506da68bb11d0d7463e6e563b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marek Vasut <marex@denx.de> | ||
| 3 | Date: Tue, 9 Feb 2016 01:52:26 +0100 | ||
| 4 | Subject: [PATCH] Support for NIOS2 architecture | ||
| 5 | |||
| 6 | Add support for the Altera NIOS2 CPU archirecture. The atomic operations | ||
| 7 | are handled by the GCC. The memory barriers on this systems are entirely | ||
| 8 | trivial too, since the CPU does not support SMP at all. | ||
| 9 | |||
| 10 | Signed-off-by: Marek Vasut <marex@denx.de> | ||
| 11 | Upstream-Status: Backport [ http://git.lttng.org/?p=userspace-rcu.git;a=commit;h=859050b3088aa3f0cb59d7f51ce24b9a0f18faa5 ] | ||
| 12 | |||
| 13 | --- | ||
| 14 | LICENSE | 1 + | ||
| 15 | README.md | 1 + | ||
| 16 | configure.ac | 1 + | ||
| 17 | urcu/arch/nios2.h | 40 ++++++++++++++++++++++++++++++++++++++++ | ||
| 18 | urcu/uatomic/nios2.h | 32 ++++++++++++++++++++++++++++++++ | ||
| 19 | 5 files changed, 75 insertions(+) | ||
| 20 | create mode 100644 urcu/arch/nios2.h | ||
| 21 | create mode 100644 urcu/uatomic/nios2.h | ||
| 22 | |||
| 23 | diff --git a/LICENSE b/LICENSE | ||
| 24 | index 3147094..a06fdcc 100644 | ||
| 25 | --- a/LICENSE | ||
| 26 | +++ b/LICENSE | ||
| 27 | @@ -45,6 +45,7 @@ compiler.h | ||
| 28 | arch/s390.h | ||
| 29 | uatomic/alpha.h | ||
| 30 | uatomic/mips.h | ||
| 31 | +uatomic/nios2.h | ||
| 32 | uatomic/s390.h | ||
| 33 | system.h | ||
| 34 | |||
| 35 | diff --git a/README.md b/README.md | ||
| 36 | index f6b290f..6fe9c1e 100644 | ||
| 37 | --- a/README.md | ||
| 38 | +++ b/README.md | ||
| 39 | @@ -43,6 +43,7 @@ Currently, the following architectures are supported: | ||
| 40 | - S390, S390x | ||
| 41 | - ARM 32/64 | ||
| 42 | - MIPS | ||
| 43 | + - NIOS2 | ||
| 44 | - Alpha | ||
| 45 | - ia64 | ||
| 46 | - Sparcv9 32/64 | ||
| 47 | diff --git a/configure.ac b/configure.ac | ||
| 48 | index eebed56..8014e1d 100644 | ||
| 49 | --- a/configure.ac | ||
| 50 | +++ b/configure.ac | ||
| 51 | @@ -136,6 +136,7 @@ AS_CASE([$host_cpu], | ||
| 52 | [arm*], [ARCHTYPE="arm"], | ||
| 53 | [aarch64*], [ARCHTYPE="aarch64"], | ||
| 54 | [mips*], [ARCHTYPE="mips"], | ||
| 55 | + [nios2*], [ARCHTYPE="nios2"], | ||
| 56 | [tile*], [ARCHTYPE="tile"], | ||
| 57 | [hppa*], [ARCHTYPE="hppa"], | ||
| 58 | [ARCHTYPE="unknown"] | ||
| 59 | diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h | ||
| 60 | new file mode 100644 | ||
| 61 | index 0000000..b4f3e50 | ||
| 62 | --- /dev/null | ||
| 63 | +++ b/urcu/arch/nios2.h | ||
| 64 | @@ -0,0 +1,40 @@ | ||
| 65 | +#ifndef _URCU_ARCH_NIOS2_H | ||
| 66 | +#define _URCU_ARCH_NIOS2_H | ||
| 67 | + | ||
| 68 | +/* | ||
| 69 | + * arch_nios2.h: trivial definitions for the NIOS2 architecture. | ||
| 70 | + * | ||
| 71 | + * Copyright (c) 2016 Marek Vasut <marex@denx.de> | ||
| 72 | + * | ||
| 73 | + * This library is free software; you can redistribute it and/or | ||
| 74 | + * modify it under the terms of the GNU Lesser General Public | ||
| 75 | + * License as published by the Free Software Foundation; either | ||
| 76 | + * version 2.1 of the License, or (at your option) any later version. | ||
| 77 | + * | ||
| 78 | + * This library is distributed in the hope that it will be useful, | ||
| 79 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 80 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 81 | + * Lesser General Public License for more details. | ||
| 82 | + * | ||
| 83 | + * You should have received a copy of the GNU Lesser General Public | ||
| 84 | + * License along with this library; if not, write to the Free Software | ||
| 85 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 86 | + */ | ||
| 87 | + | ||
| 88 | +#include <urcu/compiler.h> | ||
| 89 | +#include <urcu/config.h> | ||
| 90 | +#include <urcu/syscall-compat.h> | ||
| 91 | + | ||
| 92 | +#ifdef __cplusplus | ||
| 93 | +extern "C" { | ||
| 94 | +#endif | ||
| 95 | + | ||
| 96 | +#define cmm_mb() cmm_barrier() | ||
| 97 | + | ||
| 98 | +#ifdef __cplusplus | ||
| 99 | +} | ||
| 100 | +#endif | ||
| 101 | + | ||
| 102 | +#include <urcu/arch/generic.h> | ||
| 103 | + | ||
| 104 | +#endif /* _URCU_ARCH_NIOS2_H */ | ||
| 105 | diff --git a/urcu/uatomic/nios2.h b/urcu/uatomic/nios2.h | ||
| 106 | new file mode 100644 | ||
| 107 | index 0000000..5b3c303 | ||
| 108 | --- /dev/null | ||
| 109 | +++ b/urcu/uatomic/nios2.h | ||
| 110 | @@ -0,0 +1,32 @@ | ||
| 111 | +#ifndef _URCU_UATOMIC_ARCH_NIOS2_H | ||
| 112 | +#define _URCU_UATOMIC_ARCH_NIOS2_H | ||
| 113 | + | ||
| 114 | +/* | ||
| 115 | + * Atomic exchange operations for the NIOS2 architecture. Let GCC do it. | ||
| 116 | + * | ||
| 117 | + * Copyright (c) 2016 Marek Vasut <marex@denx.de> | ||
| 118 | + * | ||
| 119 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| 120 | + * of this software and associated documentation files (the "Software"), to | ||
| 121 | + * deal in the Software without restriction, including without limitation the | ||
| 122 | + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 123 | + * sell copies of the Software, and to permit persons to whom the Software is | ||
| 124 | + * furnished to do so, subject to the following conditions: | ||
| 125 | + * | ||
| 126 | + * The above copyright notice and this permission notice shall be included in | ||
| 127 | + * all copies or substantial portions of the Software. | ||
| 128 | + * | ||
| 129 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 130 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 131 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| 132 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| 133 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 134 | + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| 135 | + * IN THE SOFTWARE. | ||
| 136 | + */ | ||
| 137 | + | ||
| 138 | +#include <urcu/compiler.h> | ||
| 139 | +#include <urcu/system.h> | ||
| 140 | +#include <urcu/uatomic/generic.h> | ||
| 141 | + | ||
| 142 | +#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */ | ||
| 143 | -- | ||
| 144 | 2.10.2 | ||
| 145 | |||
| diff --git a/meta/recipes-support/liburcu/liburcu_0.10.0.bb b/meta/recipes-support/liburcu/liburcu_0.10.0.bb new file mode 100644 index 0000000000..4ecb20b75c --- /dev/null +++ b/meta/recipes-support/liburcu/liburcu_0.10.0.bb | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | SUMMARY = "Userspace RCU (read-copy-update) library" | ||
| 2 | HOMEPAGE = "http://lttng.org/urcu" | ||
| 3 | BUGTRACKER = "http://lttng.org/project/issues" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2.1+ & MIT-style" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ | ||
| 7 | file://src/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ | ||
| 8 | file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" | ||
| 9 | |||
| 10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ | ||
| 11 | " | ||
| 12 | |||
| 13 | SRC_URI[md5sum] = "69dab85b6929c378338b9504adc6aea7" | ||
| 14 | SRC_URI[sha256sum] = "7cb58a7ba5151198087f025dc8d19d8918e9c6d56772f039696c111d9aad3190" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/userspace-rcu-${PV}" | ||
| 17 | inherit autotools | ||
| diff --git a/meta/recipes-support/liburcu/liburcu_0.9.3.bb b/meta/recipes-support/liburcu/liburcu_0.9.3.bb deleted file mode 100644 index 926ba024ca..0000000000 --- a/meta/recipes-support/liburcu/liburcu_0.9.3.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | SUMMARY = "Userspace RCU (read-copy-update) library" | ||
| 2 | HOMEPAGE = "http://lttng.org/urcu" | ||
| 3 | BUGTRACKER = "http://lttng.org/project/issues" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2.1+ & MIT-style" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ | ||
| 7 | file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ | ||
| 8 | file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" | ||
| 9 | |||
| 10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ | ||
| 11 | file://0001-Support-for-NIOS2-architecture.patch \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "920970e35a1a2066c8353eabfeab8730" | ||
| 15 | SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" | ||
| 16 | |||
| 17 | S = "${WORKDIR}/userspace-rcu-${PV}" | ||
| 18 | inherit autotools | ||
