From patchwork Mon Feb 20 14:29:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65273 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 B20E9383E297 for ; Mon, 20 Feb 2023 14:30:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B20E9383E297 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903432; bh=yqouHRnKkCMd6WHeerT8LuBwqskLlYtUm5cL3Usfah4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=k6AalqRe8vk4zbr2o2qN9aYiv51/A7x+hdkz9adYppkUatmX6aII17/9bQvjkaBzH pLcfktcSMinR1f6jNUobZ98Cff6K5/39EZkkkosxSEWMtGQEeKI9Gb/uppMvHEdUJo Ps6IJSNnjwDqtOAO4ziI/utq42g3QhgkPlGz2q7U= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 6E126384180E for ; Mon, 20 Feb 2023 14:30:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E126384180E Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1720d087ff4so1369693fac.1 for ; Mon, 20 Feb 2023 06:30:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yqouHRnKkCMd6WHeerT8LuBwqskLlYtUm5cL3Usfah4=; b=Wl7rJquZxZXHkp53LW3DMxt+h727fixONHif6/hTKyxKRxKpFsI4/qjGswebdkxWx/ jS2a12L2Xol2qzVwesRK3tMiB+xyLtZdqHo/+VI7M63WgUlbcPcD7dknpMJ+eNYiBnIq +YOBm7eA7wiJOXQ3wE1Y2BCuxfWDsAyLVQ8etAedvMRYMkc9KKMvdh82raDTY1CcJ2Jo bnPiRcMwhFXxnKH1/YIjDtqNyWPlUNd9vs8BmUJ2VeJTPIgH0AOTKCHC9qaVGYudSiH4 Au3WYN8zWv/G8f3z5DqnbPS6TSsgRJI1GSnbbh3NiubgmSuqkQqWTyPuyHqbLQvGb9Yk 3pmA== X-Gm-Message-State: AO0yUKUyBVL1tcfvuC6jrmqTrV9oOti0msxznK4BAbuyWEPcKHL6Q1NX 09OTQRk/rIY+LnTnzMuVq4HJi0iwCMs2E2/y5lo= X-Google-Smtp-Source: AK7set8HJAnAW+P/4RMyD6Xcfr2nlDHQTKzp/PA93POmvz3YU4vdxES/p+6P1q5+MK2no4nWYC7WUg== X-Received: by 2002:a05:6870:55a6:b0:16d:ebb2:f9fe with SMTP id n38-20020a05687055a600b0016debb2f9femr3187025oao.19.1676903407219; Mon, 20 Feb 2023 06:30:07 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:06 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 1/5] Linux: Move wordsize-32 Version to default Date: Mon, 20 Feb 2023 11:29:53 -0300 Message-Id: <20230220142957.1180692-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And remove redundant entries on other architectures Version. The version for fallocate64 was supposed to be 2.10, but it was then added to 32-bit platforms in 2.11 because it mistakenly wasn't exported for them in 2.10 (see the commit message for 1f3615a1c97a030bca59f728f998947f852679b9). The linux/generic did not exist before 2.15, i.e. when the tile ports were added (and microblaze did not exist before 2.18), which explains those differences but also illustrates that "2.11 for 32-bit, 2.10 for 64-bit" should be sufficient since versions older than the minimum for the architecture are automatically adjusted. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/Versions | 3 +++ sysdeps/unix/sysv/linux/arm/Versions | 3 --- sysdeps/unix/sysv/linux/generic/wordsize-32/Versions | 5 ----- sysdeps/unix/sysv/linux/hppa/Versions | 3 --- sysdeps/unix/sysv/linux/i386/Versions | 4 ---- sysdeps/unix/sysv/linux/m68k/Versions | 3 --- sysdeps/unix/sysv/linux/microblaze/Versions | 5 ----- sysdeps/unix/sysv/linux/mips/Versions | 3 --- sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions | 3 --- sysdeps/unix/sysv/linux/s390/s390-32/Versions | 3 --- sysdeps/unix/sysv/linux/sh/Versions | 3 --- sysdeps/unix/sysv/linux/sparc/sparc32/Versions | 3 --- 12 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/Versions delete mode 100644 sysdeps/unix/sysv/linux/microblaze/Versions diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index ca6eb1a49e..bc59bce42f 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -157,6 +157,9 @@ libc { GLIBC_2.10 { fallocate; } + GLIBC_2.11 { + fallocate64; + } GLIBC_2.12 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; diff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions index 7e5ba53455..6e7cb6e2e5 100644 --- a/sysdeps/unix/sysv/linux/arm/Versions +++ b/sysdeps/unix/sysv/linux/arm/Versions @@ -4,9 +4,6 @@ libc { inb; inw; inl; outb; outw; outl; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.24 { recvmsg; sendmsg; } diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions b/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions deleted file mode 100644 index cdc6022015..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions +++ /dev/null @@ -1,5 +0,0 @@ -libc { - GLIBC_2.15 { - fallocate64; - } -} diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions index 357c68a782..78528e5fa2 100644 --- a/sysdeps/unix/sysv/linux/hppa/Versions +++ b/sysdeps/unix/sysv/linux/hppa/Versions @@ -13,9 +13,6 @@ libc { GLIBC_2.4 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.12 { _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions index 1335e6551b..f99a4d88d0 100644 --- a/sysdeps/unix/sysv/linux/i386/Versions +++ b/sysdeps/unix/sysv/linux/i386/Versions @@ -37,10 +37,6 @@ libc { # v* vm86; } - GLIBC_2.11 { - # f* - fallocate64; - } GLIBC_PRIVATE { __modify_ldt; __uname; } diff --git a/sysdeps/unix/sysv/linux/m68k/Versions b/sysdeps/unix/sysv/linux/m68k/Versions index d98ae120c1..a77ea60338 100644 --- a/sysdeps/unix/sysv/linux/m68k/Versions +++ b/sysdeps/unix/sysv/linux/m68k/Versions @@ -29,9 +29,6 @@ libc { # v* versionsort64; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.31 { msgctl; semctl; shmctl; } diff --git a/sysdeps/unix/sysv/linux/microblaze/Versions b/sysdeps/unix/sysv/linux/microblaze/Versions deleted file mode 100644 index aa48a3c155..0000000000 --- a/sysdeps/unix/sysv/linux/microblaze/Versions +++ /dev/null @@ -1,5 +0,0 @@ -libc { - GLIBC_2.18 { - fallocate64; - } -} diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions index db6222e9a7..9ea0fa65a4 100644 --- a/sysdeps/unix/sysv/linux/mips/Versions +++ b/sysdeps/unix/sysv/linux/mips/Versions @@ -26,9 +26,6 @@ libc { pthread_attr_setstack; pthread_attr_setstacksize; } - GLIBC_2.11 { - fallocate64; - } GLIBC_PRIVATE { # nptl/pthread_cond_timedwait.c uses INTERNAL_VSYSCALL(clock_gettime). __vdso_clock_gettime; diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions index 918e0231d0..416e8db5ae 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions @@ -31,9 +31,6 @@ libc { siglongjmp; swapcontext; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.17 { __ppc_get_timebase_freq; } diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions index bd1a46df88..1b96fc42a3 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions +++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions @@ -44,9 +44,6 @@ libc { getutmpx; login; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.31 { msgctl; semctl; shmctl; } diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions index 9c734ff755..3ad702e165 100644 --- a/sysdeps/unix/sysv/linux/sh/Versions +++ b/sysdeps/unix/sysv/linux/sh/Versions @@ -22,9 +22,6 @@ libc { # v* versionsort64; } - GLIBC_2.11 { - fallocate64; - } GLIBC_2.16 { fanotify_mark; } diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions index d928a65346..4529e7fe6f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions @@ -17,7 +17,4 @@ libc { # s* scandir64; } - GLIBC_2.11 { - fallocate64; - } } From patchwork Mon Feb 20 14:29:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65274 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 7556D383FE36 for ; Mon, 20 Feb 2023 14:30:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7556D383FE36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903439; bh=uwBKMmLSMGBd4OkZVO2qkxNU+W15xJcdujHocDHSSV4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=MEWbR/z2lLvgjy4v6fFE05QLLZqM494S8kPXao0tK8/vDnaXQiYAtuUK7l3+vlQLl QplTH8LPQe+xaiZx8RYrs/HqIykoqDspmk0WRYrXdrk6AT2bdabkycEhtG3n7H3sWI HM/i/S0Vi1uEXx0/SqUe3CJc76GTjoHU8whFJzbk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 609933846926 for ; Mon, 20 Feb 2023 14:30:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 609933846926 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-172094e10e3so1554085fac.10 for ; Mon, 20 Feb 2023 06:30:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uwBKMmLSMGBd4OkZVO2qkxNU+W15xJcdujHocDHSSV4=; b=tUPsi9Rlt5XwRnDWBBmwIDKE+qlk6g0O+8dlma46wINljt4AcAD461lOo/Uu1+d7dd +5RQd51v7HkwMy4mYNBELhEdNLIiWmXDTmMBr9txtve0kmqIMisOB5tyd+JS5jUeC9/M aW2O/PnbP3oc3BROfJszyA2tdcLZWX4OiMzAFWPF2nl2JAbogmmYPPWfzCHsYJ18sR+/ 7d1b5qj68Lt+igcKEfXl2p4CS1UGf8GU/oDvxwfBkjvTQAI4lFMizZ8pHLhGTNBdYjqE uWAr4LSE9c2l3sFG1//l/RD42F5O3KEU2FaH/g3Py3fpoEq5jjZSipYfkP2bmykESd+F P7aA== X-Gm-Message-State: AO0yUKUWzdzyBkkkzw6hjs7GQEtt/dBr/D+M6XUGKSj+z2hmJ+KsCnGV mob/0/ajsmkCsO6zZC2+9zLaundTrbaKs1Y/bks= X-Google-Smtp-Source: AK7set8vBFpe68XhVdj/odweXIaAC7dQzRpXIgGS9IynNsbIXiJFN17W32RZdbny+nWCDRo4HB0xIA== X-Received: by 2002:a05:6870:d285:b0:16e:3645:b2e5 with SMTP id d5-20020a056870d28500b0016e3645b2e5mr4687806oae.28.1676903410108; Mon, 20 Feb 2023 06:30:10 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:09 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 2/5] Linux: Assume and consolidate getsockname wire-up syscall Date: Mon, 20 Feb 2023 11:29:54 -0300 Message-Id: <20230220142957.1180692-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-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_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And disable if kernel does not support it. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/syscalls.list | 1 - sysdeps/unix/sysv/linux/getsockname.c | 7 +------ sysdeps/unix/sysv/linux/i386/kernel-features.h | 2 +- sysdeps/unix/sysv/linux/kernel-features.h | 1 + sysdeps/unix/sysv/linux/m68k/kernel-features.h | 2 +- sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 1 - sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 1 - sysdeps/unix/sysv/linux/s390/kernel-features.h | 2 +- sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 - sysdeps/unix/sysv/linux/sparc/kernel-features.h | 6 ++++++ 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list index 7dbfde0dae..e89ce91ac0 100644 --- a/sysdeps/unix/sysv/linux/generic/syscalls.list +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list @@ -1,5 +1,4 @@ # File name Caller Syscall name # args Strong name Weak names # Socket APIs -getsockname - getsockname i:ipp __getsockname getsockname getpeername - getpeername i:ipp __getpeername getpeername diff --git a/sysdeps/unix/sysv/linux/getsockname.c b/sysdeps/unix/sysv/linux/getsockname.c index 38e6f2dac6..61973fa5cd 100644 --- a/sysdeps/unix/sysv/linux/getsockname.c +++ b/sysdeps/unix/sysv/linux/getsockname.c @@ -15,19 +15,14 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include - #include -#include -#include int __getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len) { #ifdef __ASSUME_GETSOCKNAME_SYSCALL - return INLINE_SYSCALL (getsockname, 3, fd, addr.__sockaddr__, len); + return INLINE_SYSCALL_CALL (getsockname, fd, addr.__sockaddr__, len); #else return SOCKETCALL (getsockname, fd, addr.__sockaddr__, len); #endif diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h index 334a31a0e5..1c5cbd3351 100644 --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h @@ -19,7 +19,6 @@ /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 #endif @@ -42,6 +41,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL +# undef __ASSUME_GETSOCKNAME_SYSCALL #endif /* i686 only supports ipc syscall before 5.1. */ diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 4b5c4afbc1..4a4d624aeb 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -84,6 +84,7 @@ #define __ASSUME_SOCKETPAIR_SYSCALL 1 #define __ASSUME_LISTEN_SYSCALL 1 #define __ASSUME_SHUTDOWN_SYSCALL 1 +#define __ASSUME_GETSOCKNAME_SYSCALL 1 /* Support for SysV IPC through wired syscalls. All supported architectures either support ipc syscall and/or all the ipc correspondent syscalls. */ diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h index 2d9b225249..e57f09a74e 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h @@ -19,7 +19,6 @@ /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 #endif @@ -44,6 +43,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL +# undef __ASSUME_GETSOCKNAME_SYSCALL #endif /* No support for PI futexes or robust mutexes before 3.10 for m68k. */ diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index e5bfa05491..10eff56743 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -19,7 +19,6 @@ /* All supported kernel versions for MicroBlaze have these syscalls. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h index 2b3cbd05c1..231742a5c3 100644 --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h @@ -19,7 +19,6 @@ /* New syscalls added for PowerPC in 2.6.37. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h index 7ca9393942..058b211e55 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h @@ -19,7 +19,6 @@ /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 #endif @@ -44,6 +43,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL +# undef __ASSUME_GETSOCKNAME_SYSCALL #endif /* s390 only supports ipc syscall before 5.1. */ diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index 931f1c8834..76e2de7bf5 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -24,7 +24,6 @@ /* These syscalls were added for SH in 2.6.37. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h index 279fa93a3b..f71aa8ca38 100644 --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h @@ -42,6 +42,12 @@ # undef __ASSUME_SETSOCKOPT_SYSCALL #endif +/* There syscalls were added for 32-bit in compat syscall table only + in 4.20 (but present for 64-bit in all supported kernel versions). */ +#if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400 +# undef __ASSUME_GETSOCKNAME_SYSCALL +#endif + /* These syscalls were added for both 32-bit and 64-bit in 4.4. */ #if __LINUX_KERNEL_VERSION < 0x040400 # undef __ASSUME_BIND_SYSCALL From patchwork Mon Feb 20 14:29:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65276 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 2936A383E282 for ; Mon, 20 Feb 2023 14:31:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2936A383E282 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903483; bh=DmJwkzcyx1XV5B6V0VuFilSN/7wyQvmKR5Xbs4lKxkg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=rmQmsxd7MVKVzoi0MmtzcXd2vVTjDnksJ13SDUem9MCbJ3Mr1i89dCDSkDjFRT5aI C+0GsmdmANExZQ+/meXstsb5eb5CajD89SNxw9LxGD6XfTsHi/urNjFApVBKHBzvfe +uUQ7lEZKrR95q0iXt+Zlx/C5opNTtLWV1PRAhFQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by sourceware.org (Postfix) with ESMTPS id E8BE2384183C for ; Mon, 20 Feb 2023 14:30:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8BE2384183C Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1720887dfcdso1592475fac.6 for ; Mon, 20 Feb 2023 06:30:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DmJwkzcyx1XV5B6V0VuFilSN/7wyQvmKR5Xbs4lKxkg=; b=ztq6Zjd9TciCbzr2Ue6Iye7XF+XAQJz2HRKhbp/OQ5yCNuwU/1/ikPX7zXpFEqAASS KS4roCTB5t7SLz1FGdfWS66t/eOWPETS/+31PpqJVwxI81yI7tGoHEog+7OkkzdHyocK D4KDZ/I8Bnluz4icJcmM9YTPAhc6bQmMR28J4NLrzIlz54qN6Fv00NnXaXVGN1PaBpQp lwBRS86Y3u35EMRN6WQ6An3NcNUaSNv3XPFBg84aOzEcSzFqszUrI5trF6niflklFAzm wdprP9/ooQgIkp3KAWQ+A4/WVYBRaENsSmPl5THFdcXiqTrnzJxbQWYWsEqnSHTxXQn+ AZFg== X-Gm-Message-State: AO0yUKXKC+u+TaXbtiHOCQe/9cLX1U9J6gNNTe754jwDLKExdfdYxtCi MA/g/a+n1o0sYs3V/393IlthxlOow1KBXq0aXuE= X-Google-Smtp-Source: AK7set+vjsQh9Lw4BEJ/aCWXINRwWYyv1PqGlXKcClVYFltmLP6neAWjETPD4krjS7BQ2v5owD3Cxw== X-Received: by 2002:a05:6870:3453:b0:16d:e230:6a31 with SMTP id i19-20020a056870345300b0016de2306a31mr5820751oah.38.1676903412986; Mon, 20 Feb 2023 06:30:12 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:12 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 3/5] Linux: Assume and consolidate getpeername wire-up syscall Date: Mon, 20 Feb 2023 11:29:55 -0300 Message-Id: <20230220142957.1180692-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And disable if kernel does not support it. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/syscalls.list | 4 ---- sysdeps/unix/sysv/linux/getpeername.c | 7 +------ sysdeps/unix/sysv/linux/i386/kernel-features.h | 6 +----- sysdeps/unix/sysv/linux/kernel-features.h | 1 + sysdeps/unix/sysv/linux/m68k/kernel-features.h | 6 +----- sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 1 - sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 1 - sysdeps/unix/sysv/linux/s390/kernel-features.h | 6 +----- sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 - sysdeps/unix/sysv/linux/sparc/kernel-features.h | 1 + 10 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/syscalls.list diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list deleted file mode 100644 index e89ce91ac0..0000000000 --- a/sysdeps/unix/sysv/linux/generic/syscalls.list +++ /dev/null @@ -1,4 +0,0 @@ -# File name Caller Syscall name # args Strong name Weak names - -# Socket APIs -getpeername - getpeername i:ipp __getpeername getpeername diff --git a/sysdeps/unix/sysv/linux/getpeername.c b/sysdeps/unix/sysv/linux/getpeername.c index eb49d40d3a..827fd631dc 100644 --- a/sysdeps/unix/sysv/linux/getpeername.c +++ b/sysdeps/unix/sysv/linux/getpeername.c @@ -15,19 +15,14 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include - #include -#include -#include int __getpeername (int fd, __SOCKADDR_ARG addr, socklen_t *len) { #ifdef __ASSUME_GETPEERNAME_SYSCALL - return INLINE_SYSCALL (getpeername, 3, fd, addr.__sockaddr__, len); + return INLINE_SYSCALL_CALL (getpeername, fd, addr.__sockaddr__, len); #else return SOCKETCALL (getpeername, fd, addr.__sockaddr__, len); #endif diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h index 1c5cbd3351..ed7efa3097 100644 --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h @@ -17,11 +17,6 @@ License along with the GNU C Library; if not, see . */ -/* Direct socketcalls available with kernel 4.3. */ -#if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETPEERNAME_SYSCALL 1 -#endif - #include_next #undef __ASSUME_ACCEPT_SYSCALL @@ -42,6 +37,7 @@ # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_GETSOCKNAME_SYSCALL +# undef __ASSUME_GETPEERNAME_SYSCALL #endif /* i686 only supports ipc syscall before 5.1. */ diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 4a4d624aeb..07b440f4ee 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -85,6 +85,7 @@ #define __ASSUME_LISTEN_SYSCALL 1 #define __ASSUME_SHUTDOWN_SYSCALL 1 #define __ASSUME_GETSOCKNAME_SYSCALL 1 +#define __ASSUME_GETPEERNAME_SYSCALL 1 /* Support for SysV IPC through wired syscalls. All supported architectures either support ipc syscall and/or all the ipc correspondent syscalls. */ diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h index e57f09a74e..d0155783b7 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h @@ -17,11 +17,6 @@ License along with the GNU C Library. If not, see . */ -/* Direct socketcalls available with kernel 4.3. */ -#if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETPEERNAME_SYSCALL 1 -#endif - #include_next #undef __ASSUME_ACCEPT_SYSCALL @@ -44,6 +39,7 @@ # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_GETSOCKNAME_SYSCALL +# undef __ASSUME_GETPEERNAME_SYSCALL #endif /* No support for PI futexes or robust mutexes before 3.10 for m68k. */ diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index 10eff56743..3d6270b633 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -19,7 +19,6 @@ /* All supported kernel versions for MicroBlaze have these syscalls. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h index 231742a5c3..e092d3bd24 100644 --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h @@ -19,7 +19,6 @@ /* New syscalls added for PowerPC in 2.6.37. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h index 058b211e55..fb87a57a15 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h @@ -17,11 +17,6 @@ License along with the GNU C Library; if not, see . */ -/* Direct socketcalls available with kernel 4.3. */ -#if __LINUX_KERNEL_VERSION >= 0x040300 -# define __ASSUME_GETPEERNAME_SYSCALL 1 -#endif - #include_next #undef __ASSUME_ACCEPT_SYSCALL @@ -44,6 +39,7 @@ # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_SYSCALL # undef __ASSUME_GETSOCKNAME_SYSCALL +# undef __ASSUME_GETPEERNAME_SYSCALL #endif /* s390 only supports ipc syscall before 5.1. */ diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index 76e2de7bf5..953fa8dff0 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -24,7 +24,6 @@ /* These syscalls were added for SH in 2.6.37. */ #define __ASSUME_CONNECT_SYSCALL 1 -#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h index f71aa8ca38..98c938c16d 100644 --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h @@ -46,6 +46,7 @@ in 4.20 (but present for 64-bit in all supported kernel versions). */ #if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400 # undef __ASSUME_GETSOCKNAME_SYSCALL +# undef __ASSUME_GETPEERNAME_SYSCALL #endif /* These syscalls were added for both 32-bit and 64-bit in 4.4. */ From patchwork Mon Feb 20 14:29:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65275 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 AF873383FE10 for ; Mon, 20 Feb 2023 14:30:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF873383FE10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903439; bh=e66ThLT5O70dL1pPyz2Eyc1VkaxPHfR0A9lViy0QQ5s=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YhXowk06NxnX+Wwp0H9roVxEvcdrnT+15xozS3zMeUyL0hfKUupMh/oW8fXwXy3QX ZcnrGmyM0OWh1HiGiles+66HKzGtju0Dx4bqxB4ZOJuRERwSEIZfgSc2tbTQ9iraNL ZMHtLl/EgQVV+Go42uxv3QRF8aJHs2iG2eNmQa9U= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 87D99383FE06 for ; Mon, 20 Feb 2023 14:30:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 87D99383FE06 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1720d087ff4so1370142fac.1 for ; Mon, 20 Feb 2023 06:30:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e66ThLT5O70dL1pPyz2Eyc1VkaxPHfR0A9lViy0QQ5s=; b=UW3g1x13bFqWcC+Vr47XsEs3LbUMgaE3OmiCxHn8rhXelG7ARldU20CA+Ym2rT9aAx ekBaaSJ+uE7zsA5K36/RD8AnUDCFghE5ewhjx9Oy3U+O51Gvo5QajVVuenzzlgsKtFvy pWOEH21zKWTxgTtGG5xKlyCAxbMZ6nioFESUwvXlLNYwVjglZLAWUUBhj5KpZpi1VuZs 0ZRen/1nnEHexANXSTFSXO9cYcTxMgdeOzvViJ+sbmdKbyZ8FkOkD7CJ+bTBbKlppiGp SqJRp+Yxslv7BU2OtSWI9n9xlr1/vunqf7pasqQ4E73afwb/R0o5dphpUH4NK98GtasK ruUA== X-Gm-Message-State: AO0yUKVRtQoJHZvAvr/+Ss1r/1vJKmoTpqlpJEIci681T8Xa0EFB0Zk9 OOLb0nfoFBTuWBl/RAsivxMTAkBLMvgnxoZzUt8= X-Google-Smtp-Source: AK7set+pDnRzBUVdhyNBmlF8iROLJHINkM/p0gZTrYB8yb5cNxI9tr7E3Hp+OtPGv7bbu1Op0gdIUg== X-Received: by 2002:a05:6870:a2d1:b0:16d:f5a8:5604 with SMTP id w17-20020a056870a2d100b0016df5a85604mr5107262oak.58.1676903414754; Mon, 20 Feb 2023 06:30:14 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:14 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 4/5] Linux: Remove unused generic Makefile Date: Mon, 20 Feb 2023 11:29:56 -0300 Message-Id: <20230220142957.1180692-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Both are already defined on default linux Makefile. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/Makefile | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/Makefile diff --git a/sysdeps/unix/sysv/linux/generic/Makefile b/sysdeps/unix/sysv/linux/generic/Makefile deleted file mode 100644 index 7e27e79772..0000000000 --- a/sysdeps/unix/sysv/linux/generic/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),misc) -sysdep_routines += epoll_create inotify_init -endif From patchwork Mon Feb 20 14:29:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65277 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 6FA2A383FDE4 for ; Mon, 20 Feb 2023 14:32:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FA2A383FDE4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903536; bh=Ic2uH+7aiKh2+Xpn/Hh1ZPhjZas+jutjndwrXB/pIEI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=oJKN7wmC82Y8+DeEinSFaUHRrfwVUSHZ7Ydjpfnoj2217vyGuMym2+zjBuDTUZVdf ZColSUlsz7raCcYgfM101Od7V4llFChJ6QznIsrzps8ASIUa7iIhiy3ptMT6N3bX/D 5feA8VSDe67ZKXMhk4TfFNnk4I06FIAmu8GSW41A= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 4332A384183D for ; Mon, 20 Feb 2023 14:30:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4332A384183D Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1720d087ff4so1370256fac.1 for ; Mon, 20 Feb 2023 06:30:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ic2uH+7aiKh2+Xpn/Hh1ZPhjZas+jutjndwrXB/pIEI=; b=g6L38fWiolL1yECH4KjFg3vCOBgaara5KnxbGTNoTmOeUL/LVYDJT+i8GGHJx1bAQG wYSU+/geJD+lSFTRJae+piVJI2WBNKqrKFmI9ZvOAgVWYK96vg9Q29ETLaac0jfEGVh3 K3znbBM+oCNmRVFbru+lE0P+FZ6FBTzKE3sMn7boAiA8YI9WLjSXXhVJ1sT6WJIiJcJP GcL+TrQCv52XW8y9/bUrEAlEMKPQVqvv+epHZTUSdwRsWhY7CuB6UkqzHcAMva+br5Ld FaniK0Xb4jJcZ2fUkwL7eeoxJIb2qzIa0UQgOtTAFUQ5u8q98neqpU/z52NsxmoNsY30 GI9Q== X-Gm-Message-State: AO0yUKWqubeVgYvTfq8dhWJh/5fDJlWzbUhIeHCL02MPCI8Qllm/Z56G W2v8jb0PW4Tsl8D65fMeBhxykCjyZTN0oiszn8I= X-Google-Smtp-Source: AK7set/q2yWVEkyRcO2W8glbSqhrVZPyBMk5fS7v+rJZEtEja2HhN9m/kYhoQysRc2XBjzSJh/sl8w== X-Received: by 2002:a05:6871:806:b0:16a:2408:ba8b with SMTP id q6-20020a056871080600b0016a2408ba8bmr8111666oap.3.1676903416446; Mon, 20 Feb 2023 06:30:16 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:15 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 5/5] Linux: Remove generic Implies Date: Mon, 20 Feb 2023 11:29:57 -0300 Message-Id: <20230220142957.1180692-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The default Linux implementation already handled the Linux generic ABIs interface used on newer architectures, so there is no need to Imply the generic any longer. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/aarch64/Implies | 1 - sysdeps/unix/sysv/linux/arc/Implies | 2 -- sysdeps/unix/sysv/linux/csky/Implies | 2 -- sysdeps/unix/sysv/linux/generic/README | 11 ----------- sysdeps/unix/sysv/linux/loongarch/lp64/Implies | 1 - sysdeps/unix/sysv/linux/nios2/Implies | 2 -- sysdeps/unix/sysv/linux/or1k/Implies | 2 -- sysdeps/unix/sysv/linux/riscv/rv32/Implies | 2 -- sysdeps/unix/sysv/linux/riscv/rv64/Implies | 1 - 9 files changed, 24 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/README diff --git a/sysdeps/unix/sysv/linux/aarch64/Implies b/sysdeps/unix/sysv/linux/aarch64/Implies index 4409e19b92..9c2d2c9870 100644 --- a/sysdeps/unix/sysv/linux/aarch64/Implies +++ b/sysdeps/unix/sysv/linux/aarch64/Implies @@ -1,3 +1,2 @@ aarch64/nptl -unix/sysv/linux/generic unix/sysv/linux/wordsize-64 diff --git a/sysdeps/unix/sysv/linux/arc/Implies b/sysdeps/unix/sysv/linux/arc/Implies index 7f739a0340..5c1698c045 100644 --- a/sysdeps/unix/sysv/linux/arc/Implies +++ b/sysdeps/unix/sysv/linux/arc/Implies @@ -1,3 +1 @@ arc/nptl -unix/sysv/linux/generic/wordsize-32 -unix/sysv/linux/generic diff --git a/sysdeps/unix/sysv/linux/csky/Implies b/sysdeps/unix/sysv/linux/csky/Implies index f37776ccef..2259772947 100644 --- a/sysdeps/unix/sysv/linux/csky/Implies +++ b/sysdeps/unix/sysv/linux/csky/Implies @@ -1,3 +1 @@ -unix/sysv/linux/generic/wordsize-32 -unix/sysv/linux/generic csky/nptl diff --git a/sysdeps/unix/sysv/linux/generic/README b/sysdeps/unix/sysv/linux/generic/README deleted file mode 100644 index 301a6107e1..0000000000 --- a/sysdeps/unix/sysv/linux/generic/README +++ /dev/null @@ -1,11 +0,0 @@ -This hierarchy supports Linux systems using the new -asm-generic/unistd.h, which removes many familiar old syscalls. For -example, to implement open(), newer Linux architectures require glibc -to invoke the __NR_openat syscall with AT_FDCWD. This hierarchy -provides all those implementations. - -It also provides support for 32-bit platforms using the 64-bit kernel -syscall APIs, as the 32-bit ones are no longer provided. Note that -newer ILP32 environments (x32 or AArch64:ILP32, for example) are -converting to use more 64-bit types in kernel syscalls, so that aspect -of this support is in more flux as of this writing. diff --git a/sysdeps/unix/sysv/linux/loongarch/lp64/Implies b/sysdeps/unix/sysv/linux/loongarch/lp64/Implies index 117c2b8efe..e0390cc3bf 100644 --- a/sysdeps/unix/sysv/linux/loongarch/lp64/Implies +++ b/sysdeps/unix/sysv/linux/loongarch/lp64/Implies @@ -1,3 +1,2 @@ unix/sysv/linux/loongarch -unix/sysv/linux/generic unix/sysv/linux/wordsize-64 diff --git a/sysdeps/unix/sysv/linux/nios2/Implies b/sysdeps/unix/sysv/linux/nios2/Implies index 4d0478bf8f..e6c9be4665 100644 --- a/sysdeps/unix/sysv/linux/nios2/Implies +++ b/sysdeps/unix/sysv/linux/nios2/Implies @@ -1,3 +1 @@ nios2/nptl -unix/sysv/linux/generic/wordsize-32 -unix/sysv/linux/generic diff --git a/sysdeps/unix/sysv/linux/or1k/Implies b/sysdeps/unix/sysv/linux/or1k/Implies index f39f16c04a..07f8e71adc 100644 --- a/sysdeps/unix/sysv/linux/or1k/Implies +++ b/sysdeps/unix/sysv/linux/or1k/Implies @@ -1,3 +1 @@ or1k/nptl -unix/sysv/linux/generic/wordsize-32 -unix/sysv/linux/generic diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/Implies b/sysdeps/unix/sysv/linux/riscv/rv32/Implies index 8b7deb33cd..83db34c5d5 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/Implies +++ b/sysdeps/unix/sysv/linux/riscv/rv32/Implies @@ -1,3 +1 @@ unix/sysv/linux/riscv -unix/sysv/linux/generic/wordsize-32 -unix/sysv/linux/generic diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/Implies b/sysdeps/unix/sysv/linux/riscv/rv64/Implies index f042343bf7..2f9ad9ff94 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/Implies +++ b/sysdeps/unix/sysv/linux/riscv/rv64/Implies @@ -1,3 +1,2 @@ unix/sysv/linux/riscv -unix/sysv/linux/generic unix/sysv/linux/wordsize-64