[lttng-dev] [PATCH urcu] Add support for m68k architecture

[Mathieu Desnoyers]

Merged into master, thanks!

Mathieu

----- On May 15, 2017, at 2:10 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> Tested-by: Laurent Vivier <laurent at vivier.eu>
> ---
> configure.ac                |  1 +
> include/urcu/arch/m68k.h    | 49 +++++++++++++++++++++++++++++++++++++++++++++
> include/urcu/uatomic/m68k.h | 44 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 94 insertions(+)
> create mode 100644 include/urcu/arch/m68k.h
> create mode 100644 include/urcu/uatomic/m68k.h
> 
> diff --git a/configure.ac b/configure.ac
> index 020adfc..1001586 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -148,6 +148,7 @@ AS_CASE([$host_cpu],
> 	[nios2*], [ARCHTYPE="nios2"],
> 	[tile*], [ARCHTYPE="tile"],
> 	[hppa*], [ARCHTYPE="hppa"],
> +	[m68k], [ARCHTYPE="m68k"],
> 	[ARCHTYPE="unknown"]
> )
> 
> diff --git a/include/urcu/arch/m68k.h b/include/urcu/arch/m68k.h
> new file mode 100644
> index 0000000..f7698c3
> --- /dev/null
> +++ b/include/urcu/arch/m68k.h
> @@ -0,0 +1,49 @@
> +#ifndef _URCU_ARCH_M68K_H
> +#define _URCU_ARCH_M68K_H
> +
> +/*
> + * arch/m68k.h: definitions for m68k architecture
> + *
> + * Copyright (c) 2017 Michael Jeanson <mjeanson at efficios.com>
> + *
> + * 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 <urcu/compiler.h>
> +#include <urcu/config.h>
> +#include <urcu/syscall-compat.h>
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#include <stdlib.h>
> +#include <sys/time.h>
> +
> +/*
> + * 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		374
> +#endif
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#include <urcu/arch/generic.h>
> +
> +#endif /* _URCU_ARCH_M68K_H */
> diff --git a/include/urcu/uatomic/m68k.h b/include/urcu/uatomic/m68k.h
> new file mode 100644
> index 0000000..60b01c7
> --- /dev/null
> +++ b/include/urcu/uatomic/m68k.h
> @@ -0,0 +1,44 @@
> +/*
> + * Atomic exchange operations for the m68k architecture. Let GCC do it.
> + *
> + * Copyright (c) 2017 Michael Jeanson <mjeanson at efficios.com>
> + *
> + * 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.
> + */
> +
> +#ifndef _URCU_ARCH_UATOMIC_M68K_H
> +#define _URCU_ARCH_UATOMIC_M68K_H
> +
> +#include <urcu/compiler.h>
> +#include <urcu/system.h>
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#define UATOMIC_HAS_ATOMIC_BYTE
> +#define UATOMIC_HAS_ATOMIC_SHORT
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#include <urcu/uatomic/generic.h>
> +
> +#endif /* _URCU_ARCH_UATOMIC_M68K_H */
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com