From patchwork Thu May 16 15:12:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 164333 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp968196ili; Thu, 16 May 2019 08:13:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1KVFicvLOSWGC2JkMNs+B2YZ1QsNrllFiTEA4hCoeVv/407e1HGCC1IAwPtNIb7I6W8Lq X-Received: by 2002:a63:2b03:: with SMTP id r3mr49448739pgr.105.1558019607666; Thu, 16 May 2019 08:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558019607; cv=none; d=google.com; s=arc-20160816; b=TIWWiU1UtxfPFs2ueOAJ47mVVLA0H9Umm7mq1ChVlxSScTwjE7DwouUhCPJyNrHy3o 504Cg+OofqreWYyUrUJ2chBTsJ2vxAmfyj5ZrePjPMPpAaLqvqBrJM1TNvj9a4KhltP+ mG9NdS4AVwcPaRZiOEmunpuowJgp3eSY1pHNAa3xJgoC+ldVMYi1uB54Z1zoysoU87/S L8Ivi75677fFR7t/rZqBmDt7r2Kob1XnY6yyBHDBWo4mHpV3N9Qfy17LLiuRxjx3dif0 QMVwp8gEVOk5dn/9VfwkfBMSU0+TDLGL8Iv/6SLjLojDwi86h5X/U7wWVqFgf4LEELr4 hGVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=Z0NY/PT9dod+1A+d1qfQoPwCf8KW58DKi3jQGSMWKSw=; b=FcFdu/A7d5c+QhxdeTZFyWMdG8ipABOtqqnhJ5p3X5C6LkVdf9buGaGJcaeW9FFKL+ ozXvtPxADB/CCKUCtsRY7NRQfRd0ebnTGUr1Wq7qbPsm1g0Ja9sDo5K/lFWCtt0IC9bj RGzYwORjKij7uExkY5iBm+Vx445EDLS+6csYgJPILgpUULI3EjdvbO6Y6J0NWPDYJfn5 pVZlc6IrNp1Oc7TNGOH8bxq4vHA/Qs1BJTWCaR6Q6zrcl4WDdGWhQs9k64rvNCCHWvup rV/hgryf9fnZWSYPKePihAZgTzurlBfq7YRV30NrjgkrXNhj1cxne4rFrzeKalCs7oeW Yt/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=EihES3Cu; dkim=pass header.i=@linaro.org header.s=google header.b=SLOvT0Gg; spf=pass (google.com: domain of libc-alpha-return-102029-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102029-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id l4si5115784pgp.280.2019.05.16.08.13.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 08:13:27 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-102029-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=EihES3Cu; dkim=pass header.i=@linaro.org header.s=google header.b=SLOvT0Gg; spf=pass (google.com: domain of libc-alpha-return-102029-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102029-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=KHzYJ0TDBZnfEWekGUs8x7EdIAtiEvW xaue6A7NFB3UopsCRTUPUuaALuCLJHBO9/7os9Z9tFHcLJNd4a4TqvrjK+sQXjk1 NkDuZthLxxrBMRN06a5y6aio1RO4X/8iKiBoTdkcXP4Mu25CGatyEFMS9sIobqDn p4rVK9XWGLtc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=oGfFdKhYhk3Xnhohmb69lc7V87Q=; b=EihES 3Cuo8wtpNRggqfzSc0eV4yzmFURcCDu5q/jD7nBF2G6/KimspQ67X1A7mLWMDCZr LFTDfeXOguqDJpLNjgKthaGueMKwyTbYnbL5LaGgyiDa5sRn7dFIV59rcFGcrPRH CwpR4G+CUmVfIhXX2+Q0l8MlDftclf1xJVWmmU= Received: (qmail 111800 invoked by alias); 16 May 2019 15:13:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 111720 invoked by uid 89); 16 May 2019 15:13:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=correspondent, Direct, aligning, 2018-2019 X-HELO: mail-ua1-f68.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=Z0NY/PT9dod+1A+d1qfQoPwCf8KW58DKi3jQGSMWKSw=; b=SLOvT0GgaHEbKOiE4lhlsTrdg78mCpMxFTyoAMpGJlJP8Q2wA3YLquXTuqC3a2SeUn 1R16bBKDwvbcPJsxpLH2hQJs+rjNlrnVMhj17M784GidXpj2J2iBHcOCWQT6QDEYCN+0 gpJrSVzYuBaitJZq2ortZxRZP3booCFE2fSyHbnKRBR4j1EsvyQUJDBC8Ge3FTWjHul6 pjqovJbUCxsj8/8XzZ1VfwGVwIXD5nBK4J1/4y1Si/fRwOWidz5yvOsqj9+5yMpIDyGF sBm6dNn0Z111NpqsQYnDl7lXBPSlM6oqEVJKU9/8MJcVf/iKdV76sbj0egB4Ypksncip xs4Q== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/5] sysvipc: Move __IPC_64 to kernel-features.h Date: Thu, 16 May 2019 12:12:46 -0300 Message-Id: <20190516151249.19029-2-adhemerval.zanella@linaro.org> In-Reply-To: <20190516151249.19029-1-adhemerval.zanella@linaro.org> References: <20190516151249.19029-1-adhemerval.zanella@linaro.org> This patch moves the __IPC_64 definition from ipc_priv.h header to kernel-features.h. It also changes the expected value for newer ports from 0x100 to 0x0, aligning with Linux UAPI. The idea is to simplify the Linux 5.1 wire-up of sysvipc syscalls for some 32-bit ABI, which expected __IPC_64 to be 0x0 (thus tying its value to minimum supported kernel version). There is no semantic change expected on any port. Checked with a build against all affected ABIs. * sysdeps/unix/sysv/linux/alpha/ipc_priv.h (__IPC_64): Remove definition. * sysdeps/unix/sysv/linux/ipc_priv.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/powerpc/ipc_priv.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/x86_64/ipc_priv.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/csky/ipc_priv.h: Remove file. * sysdeps/unix/sysv/linux/hppa/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/ia64/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/nios2/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/riscv/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__IPC_64): Define. * sysdeps/unix/sysv/linux/arm/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/i386/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/m68k/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h (__IPC_64): Likewise. * sysdeep/unix/sysv/linux/mips/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/s390/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/sh/kernel-features.h (__IPC_64): Likewise. * sysdeps/unix/sysv/linux/nios2/kernel-features.h: New file. * sysdeps/unix/sysv/linux/sparc/kernel-features.h [!__arch64__] (__IPC_64): Define. --- sysdeps/unix/sysv/linux/alpha/ipc_priv.h | 2 -- .../unix/sysv/linux/alpha/kernel-features.h | 4 ++++ sysdeps/unix/sysv/linux/arm/kernel-features.h | 8 +++++++ sysdeps/unix/sysv/linux/csky/ipc_priv.h | 21 ------------------- sysdeps/unix/sysv/linux/hppa/ipc_priv.h | 21 ------------------- .../unix/sysv/linux/i386/kernel-features.h | 7 +++++++ sysdeps/unix/sysv/linux/ia64/ipc_priv.h | 21 ------------------- sysdeps/unix/sysv/linux/ipc_priv.h | 2 -- sysdeps/unix/sysv/linux/kernel-features.h | 1 + .../unix/sysv/linux/m68k/kernel-features.h | 8 +++++++ .../sysv/linux/microblaze/kernel-features.h | 7 +++++++ .../unix/sysv/linux/mips/kernel-features.h | 8 +++++++ .../unix/sysv/linux/mips/mips64/ipc_priv.h | 2 -- sysdeps/unix/sysv/linux/nios2/ipc_priv.h | 21 ------------------- .../ipc_priv.h => nios2/kernel-features.h} | 17 ++++++++++----- sysdeps/unix/sysv/linux/powerpc/ipc_priv.h | 2 -- .../unix/sysv/linux/powerpc/kernel-features.h | 8 +++++++ sysdeps/unix/sysv/linux/riscv/ipc_priv.h | 21 ------------------- .../unix/sysv/linux/s390/kernel-features.h | 8 +++++++ sysdeps/unix/sysv/linux/sh/kernel-features.h | 3 +++ .../unix/sysv/linux/sparc/kernel-features.h | 9 ++++++++ .../unix/sysv/linux/sparc/sparc64/ipc_priv.h | 2 -- sysdeps/unix/sysv/linux/x86_64/ipc_priv.h | 2 -- 23 files changed, 83 insertions(+), 122 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/csky/ipc_priv.h delete mode 100644 sysdeps/unix/sysv/linux/hppa/ipc_priv.h delete mode 100644 sysdeps/unix/sysv/linux/ia64/ipc_priv.h delete mode 100644 sysdeps/unix/sysv/linux/nios2/ipc_priv.h rename sysdeps/unix/sysv/linux/{aarch64/ipc_priv.h => nios2/kernel-features.h} (62%) delete mode 100644 sysdeps/unix/sysv/linux/riscv/ipc_priv.h -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/alpha/ipc_priv.h b/sysdeps/unix/sysv/linux/alpha/ipc_priv.h index fc5e713f42..8b91e2f9fa 100644 --- a/sysdeps/unix/sysv/linux/alpha/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/alpha/ipc_priv.h @@ -18,8 +18,6 @@ #include /* For __key_t */ -#define __IPC_64 0x100 - struct __old_ipc_perm { __key_t __key; /* Key. */ diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index f3298b234e..00f7d44df0 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -22,6 +22,10 @@ #include_next +/* Alpha support old sysvipc even being a 64-bit architecture. */ +#undef __IPC_64 +#define __IPC_64 0x100 + /* There never has been support for fstat64. */ #undef __ASSUME_STATFS64 #define __ASSUME_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h index 2d2d355844..4f5c621f82 100644 --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library. If not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + #include_next /* The ARM kernel before 3.14.3 may or may not support @@ -50,3 +53,8 @@ #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS 1 + +#undef __IPC_64 +#define __IPC_64 0x100 + +#endif /* _KERNEL_FEATURE_H */ diff --git a/sysdeps/unix/sysv/linux/csky/ipc_priv.h b/sysdeps/unix/sysv/linux/csky/ipc_priv.h deleted file mode 100644 index e1beadb2a0..0000000000 --- a/sysdeps/unix/sysv/linux/csky/ipc_priv.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Old SysV permission definition for Linux. C-SKY version. - Copyright (C) 2017-2019 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 /* For __key_t */ - -#define __IPC_64 0x0 diff --git a/sysdeps/unix/sysv/linux/hppa/ipc_priv.h b/sysdeps/unix/sysv/linux/hppa/ipc_priv.h deleted file mode 100644 index 5e170a9a2b..0000000000 --- a/sysdeps/unix/sysv/linux/hppa/ipc_priv.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Old SysV permission definition for Linux. Hppa version. - Copyright (C) 2017-2019 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 /* For __key_t */ - -#define __IPC_64 0x0 diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h index 3ac725b5a2..5a26328d97 100644 --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 # define __ASSUME_SOCKET_SYSCALL 1 @@ -45,6 +48,10 @@ /* i686 only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS +#undef __IPC_64 +#define __IPC_64 0x100 #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS 1 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/ia64/ipc_priv.h b/sysdeps/unix/sysv/linux/ia64/ipc_priv.h deleted file mode 100644 index 6b2438cd03..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/ipc_priv.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Old SysV permission definition for Linux. IA64 version. - Copyright (C) 2017-2019 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 /* For __key_t */ - -#define __IPC_64 0x0 diff --git a/sysdeps/unix/sysv/linux/ipc_priv.h b/sysdeps/unix/sysv/linux/ipc_priv.h index 7f517eb6fd..65adbb093e 100644 --- a/sysdeps/unix/sysv/linux/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/ipc_priv.h @@ -18,8 +18,6 @@ #include /* For __key_t */ -#define __IPC_64 0x100 - struct __old_ipc_perm { __key_t __key; /* Key. */ diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index bc5c959f58..8fb6078de5 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -80,6 +80,7 @@ /* Support for SysV IPC through wired syscalls. All supported architectures either support ipc syscall and/or all the ipc correspondent syscalls. */ #define __ASSUME_DIRECT_SYSVIPC_SYSCALLS 1 +#define __IPC_64 0x0 /* Support for p{read,write}v2 was added in 4.6. However Linux default implementation does not assume the __ASSUME_* and instead use a fallback diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h index 1976724362..8e81bb98ef 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library. If not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 # define __ASSUME_SOCKET_SYSCALL 1 @@ -52,3 +55,8 @@ /* m68k only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS + +#undef __IPC_64 +#define __IPC_64 0x100 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index 8df19400af..84b813d6ab 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -15,6 +15,8 @@ License along with the GNU C Library. If not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 /* All supported kernel versions for MicroBlaze have these syscalls. */ #define __ASSUME_SOCKET_SYSCALL 1 @@ -72,3 +74,8 @@ #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS3 + +#undef __IPC_64 +#define __IPC_64 0x100 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h index c341c3fa10..d90d87a5b0 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel-features.h +++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library. If not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + #include #include_next @@ -27,6 +30,9 @@ # undef __ASSUME_SET_ROBUST_LIST #endif +#undef __IPC_64 +#define __IPC_64 0x100 + /* Define this if your 32-bit syscall API requires 64-bit register pairs to start with an even-number register. */ #if _MIPS_SIM == _ABIO32 @@ -50,3 +56,5 @@ #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS 1 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h b/sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h index bb31656069..ab5db79e25 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h @@ -18,8 +18,6 @@ #include -#define __IPC_64 0x100 - struct __old_ipc_perm { __key_t __key; /* Key. */ diff --git a/sysdeps/unix/sysv/linux/nios2/ipc_priv.h b/sysdeps/unix/sysv/linux/nios2/ipc_priv.h deleted file mode 100644 index d6e6be797a..0000000000 --- a/sysdeps/unix/sysv/linux/nios2/ipc_priv.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Old SysV permission definition for Linux. Nios II version. - Copyright (C) 2017-2019 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 /* For __key_t */ - -#define __IPC_64 0x0 diff --git a/sysdeps/unix/sysv/linux/aarch64/ipc_priv.h b/sysdeps/unix/sysv/linux/nios2/kernel-features.h similarity index 62% rename from sysdeps/unix/sysv/linux/aarch64/ipc_priv.h rename to sysdeps/unix/sysv/linux/nios2/kernel-features.h index cf55907693..813177f7b7 100644 --- a/sysdeps/unix/sysv/linux/aarch64/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/nios2/kernel-features.h @@ -1,5 +1,6 @@ -/* Old SysV permission definition for Linux. AArch64 version. - Copyright (C) 2016-2019 Free Software Foundation, Inc. +/* Set flags signalling availability of kernel features based on given + kernel version number. NIOS2 version. + Copyright (C) 2019 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 @@ -13,9 +14,15 @@ 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 + License along with the GNU C Library. If not, see . */ -#include /* For __key_t */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 -#define __IPC_64 0x0 +#include_next + +#undef __IPC_64 +#define __IPC_64 0x100 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h b/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h index 3450933f56..1c480ac0dd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h @@ -18,8 +18,6 @@ #include /* For __key_t */ -#define __IPC_64 0x100 - struct __old_ipc_perm { __key_t __key; /* Key. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h index 413a185db3..b0fd94b139 100644 --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + /* New syscalls added for PowerPC in 2.6.37. */ #define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1 @@ -47,5 +50,10 @@ /* powerpc only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS +#undef __IPC_64 +#define __IPC_64 0x100 + #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS 1 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/riscv/ipc_priv.h b/sysdeps/unix/sysv/linux/riscv/ipc_priv.h deleted file mode 100644 index ea957a56be..0000000000 --- a/sysdeps/unix/sysv/linux/riscv/ipc_priv.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Old SysV permission definition for Linux. RISC-V version. - Copyright (C) 2018-2019 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 /* For __key_t */ - -#define __IPC_64 0x0 diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h index 8fdf38c454..12338c0090 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + /* Direct socketcalls available with kernel 4.3. */ #if __LINUX_KERNEL_VERSION >= 0x040300 # define __ASSUME_SOCKET_SYSCALL 1 @@ -48,5 +51,10 @@ /* s390 only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS +#undef __IPC_64 +#define __IPC_64 0x100 + #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS2 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index 767df721b8..1f8e140232 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -44,6 +44,9 @@ /* sh only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS +#undef __IPC_64 +#define __IPC_64 0x100 + /* Support for several syscalls was added in 4.8. */ #if __LINUX_KERNEL_VERSION < 0x040800 # undef __ASSUME_RENAMEAT2 diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h index f441bd811d..4cbe8399ac 100644 --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _KERNEL_FEATURES_H +#define _KERNEL_FEATURES_H 1 + #include_next /* 32-bit SPARC kernels do not support @@ -60,6 +63,10 @@ /* sparc only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS +#ifndef __arch64__ +# undef __IPC_64 +# define __IPC_64 0x100 +#endif /* Support for the renameat2 syscall was added in 3.16. */ #if __LINUX_KERNEL_VERSION < 0x031000 @@ -79,3 +86,5 @@ (INLINE_CLONE_SYSCALL). */ #undef __ASSUME_CLONE_DEFAULT #define __ASSUME_CLONE_BACKWARDS 1 + +#endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h b/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h index 8936aed022..685c25439b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h @@ -18,8 +18,6 @@ #include /* For __key_t */ -#define __IPC_64 0x0 - struct __old_ipc_perm { __key_t __key; /* Key. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/ipc_priv.h b/sysdeps/unix/sysv/linux/x86_64/ipc_priv.h index 1ac288aa65..ab44949e6d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/ipc_priv.h +++ b/sysdeps/unix/sysv/linux/x86_64/ipc_priv.h @@ -18,8 +18,6 @@ #include /* For __key_t */ -#define __IPC_64 0x0 - struct __old_ipc_perm { __key_t __key; /* Key. */