From patchwork Mon Nov 22 18:54:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 48007 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DEC833858010 for ; Mon, 22 Nov 2021 18:57:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEC833858010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637607477; bh=Fnx9oF3ttlLjPaKWhDaXKymj57D6ka4hWCVHIRoI7Kc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=olC941yQAbUtiIR2hRsMY1k1CivS7oFuZyvMs68j1rQ3gOirfTl5/uABEa/cTgDQP 8Mr2lFO7IexlqH0YVca0x7SEqjBUHOejMqX5VMbgbokeAgiXobaRzKgTw/y3dyvesN jptgUj+JL10N4gsOoHwKaUndTozdZ+qgfk6RHK8c= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x932.google.com (mail-ua1-x932.google.com [IPv6:2607:f8b0:4864:20::932]) by sourceware.org (Postfix) with ESMTPS id CA0373858017 for ; Mon, 22 Nov 2021 18:54:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA0373858017 Received: by mail-ua1-x932.google.com with SMTP id b17so38723107uas.0 for ; Mon, 22 Nov 2021 10:54:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fnx9oF3ttlLjPaKWhDaXKymj57D6ka4hWCVHIRoI7Kc=; b=HIgOYExEgMquRjDb25xoJck9nwv7fGY+yE+dE1yjuuvr8dxMLc6G575jITO3xaE9jA t9WJtq18BmPP0N1lSl2JH6P9ytB1uVys8E9qRZGZ/UDyL6WGg3cCvhYcL//9z6F05ANd D02TrNd7Tah1tZrmwTGwDRZZnyXCzgysWJo0T+SX2hqQZeG2PgcLTPnnSKz4AIH+PCtt iiNmXpSG/sgY1AGr6Kn+o7qRwHgn4cHl42FI0h++26FS3pIn5uBjt9Pwd0cqXWQOhfyJ d3T2ZYlky4+yS1cDE7UlosjpCUrBli5AyWRsyNe0NmcUAKIGQNGfpUOe3fGY5stHrkzh //WQ== X-Gm-Message-State: AOAM532gWSPyM35fnZVWrHRtlJKny+e7q1x9HHF89iQ7tMWsT/Hd8eyv +KyxJXC+CodBdnNWQlTL3Nb1t00m7PxdIw== X-Google-Smtp-Source: ABdhPJwKTzarI0i09NLtYAMKwyAAZRsiX/J8OGZVukZugM9A/fTZ150M8KYlIqed1mmbda2RmvWYmA== X-Received: by 2002:ab0:22d6:: with SMTP id z22mr87824395uam.65.1637607287133; Mon, 22 Nov 2021 10:54:47 -0800 (PST) Received: from birita.. ([2804:431:c7cb:e054:bce6:bc54:280c:f077]) by smtp.gmail.com with ESMTPSA id g187sm5197166vsc.10.2021.11.22.10.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 10:54:46 -0800 (PST) To: libc-alpha@sourceware.org, Stafford Horne Subject: [PATCH 4/6] linux: Implement pipe in terms of __NR_pipe2 Date: Mon, 22 Nov 2021 15:54:35 -0300 Message-Id: <20211122185437.1934590-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122185437.1934590-1-adhemerval.zanella@linaro.org> References: <20211122185437.1934590-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It removes the arch-specific implementation for alpha, ia64, mips, sh, and sparc which requires a different kernel ABI than the usual one. Checked on x86_64-linux-gnu and with a build for the affected ABIs. --- sysdeps/unix/alpha/pipe.S | 30 -------------- sysdeps/unix/mips/pipe.S | 31 --------------- sysdeps/unix/sysv/linux/alpha/pipe.S | 1 - sysdeps/unix/sysv/linux/ia64/pipe.S | 36 ----------------- sysdeps/unix/sysv/linux/mips/pipe.S | 1 - sysdeps/unix/sysv/linux/{generic => }/pipe.c | 5 ++- sysdeps/unix/sysv/linux/sh/pipe.S | 42 -------------------- sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S | 38 ------------------ sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S | 39 ------------------ sysdeps/unix/sysv/linux/syscalls.list | 1 - 10 files changed, 3 insertions(+), 221 deletions(-) delete mode 100644 sysdeps/unix/alpha/pipe.S delete mode 100644 sysdeps/unix/mips/pipe.S delete mode 100644 sysdeps/unix/sysv/linux/alpha/pipe.S delete mode 100644 sysdeps/unix/sysv/linux/ia64/pipe.S delete mode 100644 sysdeps/unix/sysv/linux/mips/pipe.S rename sysdeps/unix/sysv/linux/{generic => }/pipe.c (87%) delete mode 100644 sysdeps/unix/sysv/linux/sh/pipe.S delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S diff --git a/sysdeps/unix/alpha/pipe.S b/sysdeps/unix/alpha/pipe.S deleted file mode 100644 index 45944535cd..0000000000 --- a/sysdeps/unix/alpha/pipe.S +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1993-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library. If not, see - . */ - -/* __pipe is a special syscall since it returns two values. */ - -#include - -PSEUDO (__pipe, pipe, 0) - stl r0, 0(a0) - stl r1, 4(a0) - mov zero, v0 - ret -PSEUDO_END(__pipe) - -libc_hidden_def (__pipe) -weak_alias (__pipe, pipe) diff --git a/sysdeps/unix/mips/pipe.S b/sysdeps/unix/mips/pipe.S deleted file mode 100644 index 6fbea01d44..0000000000 --- a/sysdeps/unix/mips/pipe.S +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1992-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library. If not, see - . */ - -#include - -SYSCALL__ (pipe, 1) - /* Plop in the two descriptors. */ - sw v0, 0(a0) - sw v1, 4(a0) - - /* Go out with a clean status. */ - move v0, zero - j ra -PSEUDO_END(__pipe) - -libc_hidden_def (__pipe) -weak_alias (__pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/alpha/pipe.S b/sysdeps/unix/sysv/linux/alpha/pipe.S deleted file mode 100644 index 1e7ec1c199..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/pipe.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/ia64/pipe.S b/sysdeps/unix/sysv/linux/ia64/pipe.S deleted file mode 100644 index ffda712920..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/pipe.S +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 1999-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library; if not, see - . */ - -/* __pipe is a special syscall since it returns two values. */ - -#include - -ENTRY(__pipe) - .regstk 1,0,0,0 - DO_CALL (SYS_ify (pipe)) - cmp.ne p6,p0=-1,r10 - ;; -(p6) st4 [in0]=r8,4 -(p6) mov ret0=0 - ;; -(p6) st4 [in0]=r9 -(p6) ret - br.cond.spnt.few __syscall_error -PSEUDO_END(__pipe) - -libc_hidden_def (__pipe) -weak_alias (__pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/mips/pipe.S b/sysdeps/unix/sysv/linux/mips/pipe.S deleted file mode 100644 index 1708888da4..0000000000 --- a/sysdeps/unix/sysv/linux/mips/pipe.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/generic/pipe.c b/sysdeps/unix/sysv/linux/pipe.c similarity index 87% rename from sysdeps/unix/sysv/linux/generic/pipe.c rename to sysdeps/unix/sysv/linux/pipe.c index a73a4e89fc..c873bed11a 100644 --- a/sysdeps/unix/sysv/linux/generic/pipe.c +++ b/sysdeps/unix/sysv/linux/pipe.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2021 Free Software Foundation, Inc. +/* Create create pipe. Linux generic version. + Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +26,7 @@ int __pipe (int __pipedes[2]) { - return INLINE_SYSCALL (pipe2, 2, __pipedes, 0); + return INLINE_SYSCALL_CALL (pipe2, (int *) __pipedes, 0); } libc_hidden_def (__pipe) weak_alias (__pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/sh/pipe.S b/sysdeps/unix/sysv/linux/sh/pipe.S deleted file mode 100644 index 0f3eb16588..0000000000 --- a/sysdeps/unix/sysv/linux/sh/pipe.S +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 1999-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library; if not, see - . */ - -#include - -ENTRY (__libc_pipe) - mov #+__NR_pipe, r3 - trapa #0x10 - mov r0, r3 - mov #-12, r2 - shad r2, r3 - not r3, r3 // r1=0 means r0 = -1 to -4095 - tst r3, r3 // i.e. error in linux - bt 1f - mov.l r0, @r4 - mov.l r1, @(4, r4) - rts - mov #0, r0 -1: - SYSCALL_ERROR_HANDLER -.Lpseudo_end: - rts - nop -PSEUDO_END (__libc_pipe) - -weak_alias (__libc_pipe, __pipe) -libc_hidden_def (__pipe) -weak_alias (__libc_pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S b/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S deleted file mode 100644 index 0fa155fa61..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 1997-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library; if not, see - . */ - -#include - - .text - .globl __syscall_error -ENTRY(__libc_pipe) - mov %o0, %o2 /* Save PIPEDES. */ - mov SYS_ify(pipe),%g1 - ta 0x10 - bcc 1f - mov %o7, %g1 - call __syscall_error - mov %g1, %o7 -1: st %o0, [%o2] /* PIPEDES[0] = %o0; */ - st %o1, [%o2 + 4] /* PIPEDES[1] = %o1; */ - retl - clr %o0 -END(__libc_pipe) - -weak_alias (__libc_pipe, __pipe) -libc_hidden_def (__pipe) -weak_alias (__libc_pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S b/sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S deleted file mode 100644 index da6ea71729..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/pipe.S +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 1997-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C 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. - - The GNU C 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 the GNU C Library; if not, see - . */ - -#include - - .text - - .globl __syscall_error -ENTRY(__libc_pipe) - mov %o0, %o2 /* Save PIPEDES. */ - LOADSYSCALL(pipe) - ta 0x6d - bcc,pt %xcc, 1f - mov %o7, %g1 - call __syscall_error - mov %g1, %o7 -1: st %o0, [%o2] /* PIPEDES[0] = %o0; */ - st %o1, [%o2 + 4] /* PIPEDES[1] = %o1; */ - retl - clr %o0 -END(__libc_pipe) - -weak_alias (__libc_pipe, __pipe) -libc_hidden_def (__pipe) -weak_alias (__libc_pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 2acd7551d3..8a32b354a9 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -38,7 +38,6 @@ mount EXTRA mount i:sssUp __mount mount munlock - munlock i:aU munlock munlockall - munlockall i: munlockall nfsservctl EXTRA nfsservctl i:ipp __compat_nfsservctl nfsservctl@GLIBC_2.0:GLIBC_2.28 -pipe - pipe i:f __pipe pipe pipe2 - pipe2 i:fi __pipe2 pipe2 pivot_root EXTRA pivot_root i:ss pivot_root query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23