# --- T2-COPYRIGHT-NOTE-BEGIN --- # T2 SDE: package/*/liburcu/hotfix-loongarch64.patch # Copyright (C) 2022 The T2 SDE Project # # This Copyright note is generated by scripts/Create-CopyPatch, # more information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License version 2 as used by the T2 SDE. # --- T2-COPYRIGHT-NOTE-END --- From 213197eea1a711da2f7cc0c04cdf33acb1b3c50e Mon Sep 17 00:00:00 2001 From: Wang Jing Date: Tue, 8 Jun 2021 19:44:49 +0800 Subject: [PATCH] Add LoongArch support --- LICENSE | 1 + README.md | 1 + include/Makefile.am | 2 ++ include/urcu/arch.h | 6 ++++ include/urcu/arch/loongarch.h | 49 ++++++++++++++++++++++++++++++++ include/urcu/uatomic.h | 2 ++ include/urcu/uatomic/loongarch.h | 44 ++++++++++++++++++++++++++++ 7 files changed, 105 insertions(+) create mode 100644 include/urcu/arch/loongarch.h create mode 100644 include/urcu/uatomic/loongarch.h diff --git a/LICENSE b/LICENSE index a06fdcc6..acf13d7b 100644 --- a/LICENSE +++ b/LICENSE @@ -44,6 +44,7 @@ MIT/X11 (BSD like) license apply to: compiler.h arch/s390.h uatomic/alpha.h +uatomic/loongarch.h uatomic/mips.h uatomic/nios2.h uatomic/s390.h diff --git a/README.md b/README.md index 02b903a2..29b3a4a7 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ Currently, the following architectures are supported: - hppa/PA-RISC - m68k - RISC-V + - LoongArch Tested on: diff --git a/include/Makefile.am b/include/Makefile.am index 3f92cc36..1a562fa3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -7,6 +7,7 @@ nobase_include_HEADERS = \ urcu/arch.h \ urcu/arch/hppa.h \ urcu/arch/ia64.h \ + urcu/arch/loongarch.h \ urcu/arch/m68k.h \ urcu/arch/mips.h \ urcu/arch/nios2.h \ @@ -67,6 +68,7 @@ nobase_include_HEADERS = \ urcu/uatomic.h \ urcu/uatomic/hppa.h \ urcu/uatomic/ia64.h \ + urcu/uatomic/loongarch.h \ urcu/uatomic/m68k.h \ urcu/uatomic/mips.h \ urcu/uatomic/nios2.h \ diff --git a/include/urcu/arch.h b/include/urcu/arch.h index 620743c0..98c96d93 100644 --- a/include/urcu/arch.h +++ b/include/urcu/arch.h @@ -49,6 +49,7 @@ * URCU_ARCH_HPPA : All HP PA-RISC variants * URCU_ARCH_M68K : All Motorola 68000 variants * URCU_ARCH_RISCV : All RISC-V variants + * URCU_ARCH_LOONGARCH : All LoongArch variants */ #if (defined(__INTEL_OFFLOAD) || defined(__TARGET_ARCH_MIC) || defined(__MIC__)) @@ -157,6 +158,11 @@ #define URCU_ARCH_RISCV 1 #include +#elif defined(__loongarch__) + +#define URCU_ARCH_LOONGARCH 1 +#include + #else #error "Cannot build: unrecognized architecture, see ." #endif diff --git a/include/urcu/arch/loongarch.h b/include/urcu/arch/loongarch.h new file mode 100644 index 00000000..a6d9fee5 --- /dev/null +++ b/include/urcu/arch/loongarch.h @@ -0,0 +1,49 @@ +#ifndef _URCU_ARCH_LOONGARCH_H +#define _URCU_ARCH_LOONGARCH_H + +/* + * arch/loongarch.h: trivial definitions for the LoongArch architecture. + * + * Copyright (c) 2021 Wang Jing + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/* + * On Linux, define the membarrier system call number if not yet available in + * the system headers. + */ +#if (defined(__linux__) && !defined(__NR_membarrier)) +#define __NR_membarrier 283 +#endif + +#ifdef __cplusplus +} +#endif + +#include + +#endif /* _URCU_ARCH_LOONGARCH_H */ diff --git a/include/urcu/uatomic.h b/include/urcu/uatomic.h index 2fb5fd40..e1ff44df 100644 --- a/include/urcu/uatomic.h +++ b/include/urcu/uatomic.h @@ -51,6 +51,8 @@ #include #elif defined(URCU_ARCH_RISCV) #include +#elif defined(URCU_ARCH_LOONGARCH) +#include #else #error "Cannot build: unrecognized architecture, see ." #endif diff --git a/include/urcu/uatomic/loongarch.h b/include/urcu/uatomic/loongarch.h new file mode 100644 index 00000000..f41302a2 --- /dev/null +++ b/include/urcu/uatomic/loongarch.h @@ -0,0 +1,44 @@ +#ifndef _URCU_UATOMIC_ARCH_LOONGARCH_H +#define _URCU_UATOMIC_ARCH_LOONGARCH_H + +/* + * Atomic exchange operations for the LoongArch architecture. Let GCC do it. + * + * Copyright (c) 2021 Wang Jing + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define UATOMIC_HAS_ATOMIC_BYTE +#define UATOMIC_HAS_ATOMIC_SHORT + +#ifdef __cplusplus +} +#endif + +#include + +#endif /* _URCU_UATOMIC_ARCH_LOONGARCH_H */ --- userspace-rcu-0.13.2/include/Makefile.in.vanilla 2022-11-01 22:38:54.100283927 +0100 +++ userspace-rcu-0.13.2/include/Makefile.in 2022-11-01 22:39:17.798281461 +0100 @@ -324,6 +324,7 @@ urcu/arch.h \ urcu/arch/hppa.h \ urcu/arch/ia64.h \ + urcu/arch/loongarch.h \ urcu/arch/m68k.h \ urcu/arch/mips.h \ urcu/arch/nios2.h \ @@ -384,6 +385,7 @@ urcu/uatomic.h \ urcu/uatomic/hppa.h \ urcu/uatomic/ia64.h \ + urcu/uatomic/loongarch.h \ urcu/uatomic/m68k.h \ urcu/uatomic/mips.h \ urcu/uatomic/nios2.h \