From: Jan Kiszka <jan.kiszka@siemens.com>
To: Clara Kowalsky <clara.kowalsky@siemens.com>, xenomai@lists.linux.dev
Cc: florian.bezdeka@siemens.com
Subject: Re: [RFC PATCH v1] cobalt/arm: Remove arm OABI support
Date: Wed, 18 Oct 2023 12:51:08 +0200 [thread overview]
Message-ID: <1f32866c-4eec-4525-9cdc-a8bb73d01117@siemens.com> (raw)
In-Reply-To: <20231018081803.298461-1-clara.kowalsky@siemens.com>
On 18.10.23 10:18, Clara Kowalsky wrote:
> As OABI is marked as obsolete since gcc > 4.6.4 (~2013) and Debian
> stopped shipping OABI toolchains long time ago, OABI support is dropped
> from Xenomai. Therefore, the kernel option OABI_COMPAT should not be
> used anymore.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> doc/asciidoc/TROUBLESHOOTING.COBALT.adoc | 9 +++----
> .../arch/arm/include/asm/xenomai/syscall.h | 24 ++++++-------------
> 2 files changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/doc/asciidoc/TROUBLESHOOTING.COBALT.adoc b/doc/asciidoc/TROUBLESHOOTING.COBALT.adoc
> index 778e74f96..14a4d53c6 100644
> --- a/doc/asciidoc/TROUBLESHOOTING.COBALT.adoc
> +++ b/doc/asciidoc/TROUBLESHOOTING.COBALT.adoc
> @@ -219,12 +219,9 @@ support.
>
> Although the program in question may be present, this message may
> happen on ARM platforms when a mismatch exists between the kernel and
> -user library configurations with respect to EABI support. Typically,
> -if user libraries are compiled with a toolchain generating OABI code,
> -the result won't run over a kernel not enabling the
> -+CONFIG_OABI_COMPAT+ option. Conversely, the product of a compilation
> -with an EABI toolchain won't run on a kernel not enabling the
> -+CONFIG_AEABI+ option.
> +user library configurations with respect to EABI support. The product
> +of a compilation with an EABI toolchain won't run on a kernel not
> +enabling the +CONFIG_AEABI+ option.
>
> === incompatible feature set
>
> diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h b/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
> index 0941e6c84..864330490 100644
> --- a/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
> +++ b/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
> @@ -25,6 +25,10 @@
> #include <errno.h>
> #include <cobalt/uapi/syscall.h>
>
> +#ifndef __ARM_EABI__
> +#error "ARM OABI support has been removed with Xenomai 3.3.x"
> +#endif
> +
> /*
> * Some of the following macros have been adapted from Linux's
> * implementation of the syscall mechanism in <asm-arm/unistd.h>:
> @@ -85,32 +89,18 @@
> #define ASM_INPUT_4 ASM_INPUT_3, "r" (__r4)
> #define ASM_INPUT_5 ASM_INPUT_4, "r" (__r5)
>
> -#define __sys2(x) #x
> -#define __sys1(x) __sys2(x)
> -
> -#ifdef __ARM_EABI__
> -#define __SYS_REG_DECL unsigned long __r7 = XENO_ARM_SYSCALL
> -#define __SYS_REG_INPUT , [__r7] "r" (__r7)
> -#define __SYS_CALLOP "push {r7}; mov %%r7,%[__r7]; swi\t0; pop {r7}"
> -#else
> -#define __SYS_REG_DECL
> -#define __SYS_REG_INPUT
> -#define __NR_OABI_SYSCALL_BASE 0x900000
> -#define __SYS_CALLOP "swi\t" __sys1(__NR_OABI_SYSCALL_BASE + XENO_ARM_SYSCALL) ""
> -#endif
> -
> #define XENOMAI_DO_SYSCALL(nr, op, args...) \
> ({ \
> ASM_INDECL_##nr; \
> - __SYS_REG_DECL; \
> + unsigned long __r7 = XENO_ARM_SYSCALL; \
> LOADARGS_##nr(__xn_syscode(op), args); \
> __asm__ __volatile__ ("" : /* */ : /* */ : \
> CLOBBER_REGS_##nr); \
> LOADREGS_##nr; \
> __asm__ __volatile__ ( \
> - __SYS_CALLOP \
> + "push {r7}; mov %%r7,%[__r7]; swi\t0; pop {r7}" \
> : "=r" (__r0) \
> - : ASM_INPUT_##nr __SYS_REG_INPUT \
> + : ASM_INPUT_##nr, [__r7] "r" (__r7) \
> : "memory"); \
> (int) __r0; \
> })
Thanks, applied.
Jan
--
Siemens AG, Technology
Linux Expert Center
prev parent reply other threads:[~2023-10-18 10:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 8:18 [RFC PATCH v1] cobalt/arm: Remove arm OABI support Clara Kowalsky
2023-10-18 10:51 ` Jan Kiszka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f32866c-4eec-4525-9cdc-a8bb73d01117@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=clara.kowalsky@siemens.com \
--cc=florian.bezdeka@siemens.com \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).