From patchwork Tue Apr 30 17:49:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Chestnykh X-Patchwork-Id: 1929794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KHjjgQUS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=uclibc-ng.org (client-ip=2a00:1828:2000:679::23; helo=helium.openadk.org; envelope-from=devel-bounces@uclibc-ng.org; receiver=patchwork.ozlabs.org) Received: from helium.openadk.org (helium.openadk.org [IPv6:2a00:1828:2000:679::23]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VTSR125lHz1ydT for ; Wed, 1 May 2024 03:50:34 +1000 (AEST) Received: from helium.openadk.org (localhost [IPv6:::1]) by helium.openadk.org (Postfix) with ESMTP id B4D7E35282E7; Tue, 30 Apr 2024 19:50:26 +0200 (CEST) Authentication-Results: helium.openadk.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KHjjgQUS; dkim-atps=neutral Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by helium.openadk.org (Postfix) with ESMTPS id 9D56B35208EE for ; Tue, 30 Apr 2024 19:50:16 +0200 (CEST) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2dfe5e0c1a6so7308951fa.1 for ; Tue, 30 Apr 2024 10:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714499415; x=1715104215; darn=uclibc-ng.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v81BLoAj7dm9ldE8TlVsT7UGS24y//eAtcGszbzDsAo=; b=KHjjgQUSkMlI/kj/ZSRfFEQaaN/LRD/zT6sVH7r3c9VsdIAkX2PgtAVvyTrKECcGxj meu7Fp2RS5Py577bG/CVmzGKUCzMdBCgMNZbWVVhf1uo490K1XzgKVh19EGJXYXdUIqT 8yn3vvlvX/RbneitBzh2iYlzkK1N4a1yktCxTvreScRabU3l/5SzNF3pA+PQwH1vTWe4 ZERy29fMWiFv/8xHqrECKZIuaKKPvHOCFwfvm0eYGIh7w4/CzxwSGKC7Zljq1SdPP9yX okYcdFyT5PsUsIlrkKAzrFff5UfgFHF+J98urDje/FM5ZC+P6HwTUlHLD1ib1ZERsz+Q bvPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714499415; x=1715104215; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=v81BLoAj7dm9ldE8TlVsT7UGS24y//eAtcGszbzDsAo=; b=YymoeUFz4IODLxuyPF3fMgKsUF42pVS9ODGJ67GltP858XHfyWdimw5nkeqqn7gD26 tTKwk8YUXJGO/qRCbA/KpJi/P4HBBXdw/e2gl62ekmWBFTbnqR+cmEda/DUKcXLgEEeE X6IYVwJ/EVXdL5h/kAX9CmIYLO1cd3gaSQFmEiaveGiot3RenPp/5gAS2J0r9pzpDhGh PC4yu3QdJhj9CSWU88b2Oxc7MCL6NxMAuGc+tehgWveoiGhHQVgQdN4/UiuA/ACtJGZf FgEexikOdsgUp31iM+6Mbf9Y6gKVv+H8WVu5gYO8e+66vVL4eY40mdGuB35fI8HlFVKa xnJg== X-Gm-Message-State: AOJu0YyoR62HPBowtdKDs2C0RUkWRQCY9QZFD0vPnucFdczEk9OhUw4i ns6LvN81hpRraN56OxKb9GRH1AcWkzmEE/qM0Ei7Su3QF8yX6KNml+oT2l24 X-Google-Smtp-Source: AGHT+IFXNCBJtFIW34fBj7jZ26uclyhbRM74Vmc5gF080nVrBudkl5oC5bO5vb4QiXdCQly7qdcQ9g== X-Received: by 2002:a19:e01c:0:b0:51b:adb6:547f with SMTP id x28-20020a19e01c000000b0051badb6547fmr121232lfg.4.1714499414535; Tue, 30 Apr 2024 10:50:14 -0700 (PDT) Received: from localhost.localdomain (109-252-38-243.nat.spd-mgts.ru. [109.252.38.243]) by smtp.gmail.com with ESMTPSA id d14-20020a19384e000000b00514b44c589csm4611176lfj.111.2024.04.30.10.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 10:50:13 -0700 (PDT) From: Dmitry Chestnykh To: devel@uclibc-ng.org Date: Tue, 30 Apr 2024 20:49:33 +0300 Message-ID: <20240430174933.756526-1-dm.chestnykh@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Message-ID-Hash: UORJT5AU3XBRADHQ3FGXNZXH3O2QOLOF X-Message-ID-Hash: UORJT5AU3XBRADHQ3FGXNZXH3O2QOLOF X-MailFrom: dm.chestnykh@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: ebotcazou@gcc.gnu.org, jakub@gcc.gnu.org, rguenth@gcc.gnu.org, Dmitry Chestnykh X-Mailman-Version: 3.3.3 Precedence: list Subject: [uclibc-ng-devel] [PATCH] sparc: Fix incorrect sigreturn stub function implementation. List-Id: uClibc-ng Development Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This function haven't have prologue/epilogue/cfi directives etc. Signed-off-by: Dmitry Chestnykh --- This patch fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 . libc/sysdeps/linux/sparc/Makefile.arch | 2 +- libc/sysdeps/linux/sparc/sigaction.c | 25 ++--------------------- libc/sysdeps/linux/sparc/sigreturn_stub.S | 14 +++++++++++++ libc/sysdeps/linux/sparc/sysdep.h | 9 ++++++++ 4 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 libc/sysdeps/linux/sparc/sigreturn_stub.S diff --git a/libc/sysdeps/linux/sparc/Makefile.arch b/libc/sysdeps/linux/sparc/Makefile.arch index d34624f36..c9529b344 100644 --- a/libc/sysdeps/linux/sparc/Makefile.arch +++ b/libc/sysdeps/linux/sparc/Makefile.arch @@ -6,7 +6,7 @@ # CSRC-y := brk.c __syscall_error.c sigaction.c -SSRC-y := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ +SSRC-y := __longjmp.S setjmp.S sigreturn_stub.S bsd-setjmp.S bsd-_setjmp.S \ syscall.S urem.S udiv.S umul.S sdiv.S rem.S pipe.S fork.S vfork.S clone.S CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c diff --git a/libc/sysdeps/linux/sparc/sigaction.c b/libc/sysdeps/linux/sparc/sigaction.c index 7895e3acd..447943e3a 100644 --- a/libc/sysdeps/linux/sparc/sigaction.c +++ b/libc/sysdeps/linux/sparc/sigaction.c @@ -30,8 +30,8 @@ _syscall5(int, rt_sigaction, int, a, int, b, int, c, int, d, int, e) -static void __rt_sigreturn_stub(void); -static void __sigreturn_stub(void); +void __rt_sigreturn_stub(void); +void __sigreturn_stub(void); int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { @@ -75,24 +75,3 @@ libc_hidden_weak(sigaction) # endif #endif - -static void -__rt_sigreturn_stub(void) -{ - __asm__( - "mov %0, %%g1\n\t" - "ta 0x10\n\t" - : /* no outputs */ - : "i" (__NR_rt_sigreturn) - ); -} -static void -__sigreturn_stub(void) -{ - __asm__( - "mov %0, %%g1\n\t" - "ta 0x10\n\t" - : /* no outputs */ - : "i" (__NR_sigreturn) - ); -} diff --git a/libc/sysdeps/linux/sparc/sigreturn_stub.S b/libc/sysdeps/linux/sparc/sigreturn_stub.S new file mode 100644 index 000000000..33f51409b --- /dev/null +++ b/libc/sysdeps/linux/sparc/sigreturn_stub.S @@ -0,0 +1,14 @@ +#include + + nop + nop + +ENTRY_NOCFI (__rt_sigreturn_stub) + mov __NR_rt_sigreturn, %g1 + ta 0x10 +END_NOCFI (__rt_sigreturn_stub) + +ENTRY_NOCFI (__sigreturn_stub) + mov __NR_sigreturn, %g1 + ta 0x10 +END_NOCFI (__sigreturn_stub) diff --git a/libc/sysdeps/linux/sparc/sysdep.h b/libc/sysdeps/linux/sparc/sysdep.h index c3897ec08..761d21454 100644 --- a/libc/sysdeps/linux/sparc/sysdep.h +++ b/libc/sysdeps/linux/sparc/sysdep.h @@ -17,6 +17,15 @@ C_LABEL(name) \ cfi_startproc; +#define ENTRY_NOCFI(name) \ + .align 4; \ + .global C_SYMBOL_NAME(name); \ + .type name, @function; \ +C_LABEL(name) + +#define END_NOCFI(name) \ + .size name, . - name + #define END(name) \ cfi_endproc; \ .size name, . - name