From patchwork Mon Feb 8 21:49:28 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: 41968 X-Patchwork-Delegate: carlos@redhat.com 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 E953B393BC27; Mon, 8 Feb 2021 21:50:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E953B393BC27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1612821002; bh=0h/PdvOUUWcZL5pfxZWnA83j1gdDoJbA56XCS2Y2lQo=; 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=bys0j56DhCJayUsMF/YyLTuDPdZQ16jI6c6txh/hdH0drIg+F5QwjNmxeyv966r5U WSSGvKzw0Q14rlgtE+3e+jkxB/r+PWYg13WMSD4JhEii0el5Aw57oi0b2MulLqa1YP bG8x/zHNou0dl46dMWxhreYST8gzamtZiGlA61FA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by sourceware.org (Postfix) with ESMTPS id E1C6B393BC13 for ; Mon, 8 Feb 2021 21:49:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E1C6B393BC13 Received: by mail-qk1-x72f.google.com with SMTP id r77so16040562qka.12 for ; Mon, 08 Feb 2021 13:49:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0h/PdvOUUWcZL5pfxZWnA83j1gdDoJbA56XCS2Y2lQo=; b=l1slnrkQBj3hSL7HJWQEgRR+o8IRNvq4johwNr1iiDPExPs6mY6rQSThT17w43me46 mZ4lgu3wxBJDkdIr430fZewefLsZb0D2crasDuq8E89A1LjmKV1z3phVTQU9JzrDsRyl RqnZo1bYIccoW46WqGPboM8tKkneLAunslnsNl7Uq1oKBQnAlUA0xXImKKH4KgsS2e3J n8KrEoOpaeBU1eiq7P/zA2BA6Yc9M5cnn3nJicY5scXMl8gWTePJ5y296giclkr4/WOg h2UbkzKGxm3P3h5WsS8NvqBgNSq9ETlbcFBnSjsfg3+TGcKyerIVTDKjjT8SEeLwKFhX jN+g== X-Gm-Message-State: AOAM530PdCkAd2j/tYXD/LAVQaWT4PLMfQXed88D+IaEiypeVjKSXL1d QLVzFC2o9LNei85kkGY7PuXJdA2d+w20ug== X-Google-Smtp-Source: ABdhPJwO1amc79unxEAjZo9IuJBQsTC4BQ33IiJq7eXDZDOkEAdYri5p6mJQuM3R+23HooEY3AfWZQ== X-Received: by 2002:a05:620a:ec9:: with SMTP id x9mr18972397qkm.333.1612820996940; Mon, 08 Feb 2021 13:49:56 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e15sm12720078qtq.43.2021.02.08.13.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 13:49:56 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 02/10] linux: Set default kernel_stat.h to LFS Date: Mon, 8 Feb 2021 18:49:28 -0300 Message-Id: <20210208214936.1502047-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210208214936.1502047-1-adhemerval.zanella@linaro.org> References: <20210208214936.1502047-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" The XSTAT_IS_XSTAT64 and STAT_IS_KERNEL_STAT flags are now set to 1 and STATFS_IS_STATFS64 is set to __STATFS_MATCHES_STATFS64. This makes the default ABI for newer ports to provide only LFS calls. A copy of non-LFS support is provided to 32-bit ABIS with non-LFS support (arm, csky, i386, m68k, nios2, s390, and sh). Is also allows to remove the 64-bit ports, which already uses the default values. This patch does not change the code generation. Reviewed-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/arc/kernel_stat.h | 27 --------- sysdeps/unix/sysv/linux/arm/kernel_stat.h | 40 +++++++++++++ .../sysv/linux/{riscv => csky}/kernel_stat.h | 12 ++-- sysdeps/unix/sysv/linux/generic/kernel_stat.h | 30 ---------- sysdeps/unix/sysv/linux/i386/kernel_stat.h | 40 +++++++++++++ sysdeps/unix/sysv/linux/ia64/kernel_stat.h | 22 ------- sysdeps/unix/sysv/linux/kernel_stat.h | 58 +++++++------------ sysdeps/unix/sysv/linux/m68k/kernel_stat.h | 40 +++++++++++++ .../linux/{aarch64 => nios2}/kernel_stat.h | 9 +-- .../linux/powerpc/powerpc64/kernel_stat.h | 22 ------- .../sysv/linux/s390/s390-32/kernel_stat.h | 40 +++++++++++++ .../sysv/linux/s390/s390-64/kernel_stat.h | 22 ------- sysdeps/unix/sysv/linux/sh/kernel_stat.h | 40 +++++++++++++ sysdeps/unix/sysv/linux/x86_64/kernel_stat.h | 22 ------- sysdeps/unix/sysv/linux/xstatconv.c | 7 +-- 15 files changed, 231 insertions(+), 200 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/arc/kernel_stat.h create mode 100644 sysdeps/unix/sysv/linux/arm/kernel_stat.h rename sysdeps/unix/sysv/linux/{riscv => csky}/kernel_stat.h (77%) delete mode 100644 sysdeps/unix/sysv/linux/generic/kernel_stat.h create mode 100644 sysdeps/unix/sysv/linux/i386/kernel_stat.h delete mode 100644 sysdeps/unix/sysv/linux/ia64/kernel_stat.h create mode 100644 sysdeps/unix/sysv/linux/m68k/kernel_stat.h rename sysdeps/unix/sysv/linux/{aarch64 => nios2}/kernel_stat.h (78%) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h create mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h create mode 100644 sysdeps/unix/sysv/linux/sh/kernel_stat.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/kernel_stat.h diff --git a/sysdeps/unix/sysv/linux/arc/kernel_stat.h b/sysdeps/unix/sysv/linux/arc/kernel_stat.h deleted file mode 100644 index edd96b1b94..0000000000 --- a/sysdeps/unix/sysv/linux/arc/kernel_stat.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2020-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 - -/* Needed to elide the itemized copy code in common xstatconv.c. */ -#define STAT_IS_KERNEL_STAT 1 -#define STAT64_IS_KERNEL_STAT64 1 - -/* Nice side-effect of 64-bit time_t switch is these are same. */ -#define XSTAT_IS_XSTAT64 1 - -#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/arm/kernel_stat.h b/sysdeps/unix/sysv/linux/arm/kernel_stat.h new file mode 100644 index 0000000000..b1bc1459f0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/kernel_stat.h @@ -0,0 +1,40 @@ +/* Definition of `struct stat' used in the kernel.. */ +struct kernel_stat + { + unsigned short int st_dev; + unsigned short int __pad1; +#define _HAVE___PAD1 + unsigned long int st_ino; + unsigned short int st_mode; + unsigned short int st_nlink; + unsigned short int st_uid; + unsigned short int st_gid; + unsigned short int st_rdev; + unsigned short int __pad2; +#define _HAVE___PAD2 + unsigned long int st_size; + unsigned long int st_blksize; + unsigned long int st_blocks; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; + unsigned long int __glibc_reserved4; +#define _HAVE___UNUSED4 + unsigned long int __glibc_reserved5; +#define _HAVE___UNUSED5 + }; + +#define _HAVE_STAT___UNUSED4 +#define _HAVE_STAT___UNUSED5 +#define _HAVE_STAT___PAD1 +#define _HAVE_STAT___PAD2 +#define _HAVE_STAT_NSEC +#define _HAVE_STAT64___PAD1 +#define _HAVE_STAT64___PAD2 +#define _HAVE_STAT64___ST_INO +#define _HAVE_STAT64_NSEC + +#define STAT_IS_KERNEL_STAT 0 +#define STAT64_IS_KERNEL_STAT64 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h b/sysdeps/unix/sysv/linux/csky/kernel_stat.h similarity index 77% rename from sysdeps/unix/sysv/linux/riscv/kernel_stat.h rename to sysdeps/unix/sysv/linux/csky/kernel_stat.h index 4ad7913762..e993021a81 100644 --- a/sysdeps/unix/sysv/linux/riscv/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/csky/kernel_stat.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2020-2021 Free Software Foundation, Inc. +/* Internal definitions for stat functions. Linux/csky. + Copyright (C) 2011-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 @@ -15,9 +16,6 @@ License along with the GNU C Library. If not, see . */ -#include - -#define STAT_IS_KERNEL_STAT 1 - -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 +#define STAT_IS_KERNEL_STAT 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/generic/kernel_stat.h b/sysdeps/unix/sysv/linux/generic/kernel_stat.h deleted file mode 100644 index 350f0cc1bb..0000000000 --- a/sysdeps/unix/sysv/linux/generic/kernel_stat.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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 - -#define STAT_IS_KERNEL_STAT 1 - -/* We provide separate 32-bit API versions that check for EOVERFLOW. */ -#if __WORDSIZE == 64 -# define XSTAT_IS_XSTAT64 1 -#else -# define XSTAT_IS_XSTAT64 0 -#endif - -#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/i386/kernel_stat.h b/sysdeps/unix/sysv/linux/i386/kernel_stat.h new file mode 100644 index 0000000000..b1bc1459f0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/kernel_stat.h @@ -0,0 +1,40 @@ +/* Definition of `struct stat' used in the kernel.. */ +struct kernel_stat + { + unsigned short int st_dev; + unsigned short int __pad1; +#define _HAVE___PAD1 + unsigned long int st_ino; + unsigned short int st_mode; + unsigned short int st_nlink; + unsigned short int st_uid; + unsigned short int st_gid; + unsigned short int st_rdev; + unsigned short int __pad2; +#define _HAVE___PAD2 + unsigned long int st_size; + unsigned long int st_blksize; + unsigned long int st_blocks; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; + unsigned long int __glibc_reserved4; +#define _HAVE___UNUSED4 + unsigned long int __glibc_reserved5; +#define _HAVE___UNUSED5 + }; + +#define _HAVE_STAT___UNUSED4 +#define _HAVE_STAT___UNUSED5 +#define _HAVE_STAT___PAD1 +#define _HAVE_STAT___PAD2 +#define _HAVE_STAT_NSEC +#define _HAVE_STAT64___PAD1 +#define _HAVE_STAT64___PAD2 +#define _HAVE_STAT64___ST_INO +#define _HAVE_STAT64_NSEC + +#define STAT_IS_KERNEL_STAT 0 +#define STAT64_IS_KERNEL_STAT64 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h b/sysdeps/unix/sysv/linux/ia64/kernel_stat.h deleted file mode 100644 index ee05a15590..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/kernel_stat.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Definition of `struct stat' used in the kernel. - Copyright (C) 2003-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 - . */ - -#define STAT_IS_KERNEL_STAT 1 -#define STAT64_IS_KERNEL_STAT64 1 -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index b1bc1459f0..6c1b175cb4 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -1,40 +1,22 @@ -/* Definition of `struct stat' used in the kernel.. */ -struct kernel_stat - { - unsigned short int st_dev; - unsigned short int __pad1; -#define _HAVE___PAD1 - unsigned long int st_ino; - unsigned short int st_mode; - unsigned short int st_nlink; - unsigned short int st_uid; - unsigned short int st_gid; - unsigned short int st_rdev; - unsigned short int __pad2; -#define _HAVE___PAD2 - unsigned long int st_size; - unsigned long int st_blksize; - unsigned long int st_blocks; - struct timespec st_atim; - struct timespec st_mtim; - struct timespec st_ctim; - unsigned long int __glibc_reserved4; -#define _HAVE___UNUSED4 - unsigned long int __glibc_reserved5; -#define _HAVE___UNUSED5 - }; +/* Internal definitions for stat functions. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#define _HAVE_STAT___UNUSED4 -#define _HAVE_STAT___UNUSED5 -#define _HAVE_STAT___PAD1 -#define _HAVE_STAT___PAD2 -#define _HAVE_STAT_NSEC -#define _HAVE_STAT64___PAD1 -#define _HAVE_STAT64___PAD2 -#define _HAVE_STAT64___ST_INO -#define _HAVE_STAT64_NSEC + 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. -#define STAT_IS_KERNEL_STAT 0 -#define STAT64_IS_KERNEL_STAT64 1 -#define XSTAT_IS_XSTAT64 0 -#define STATFS_IS_STATFS64 0 + 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 + . */ + +/* The default Linux ABI assumes only LFS support. */ +#define XSTAT_IS_XSTAT64 1 +#define STATFS_IS_STATFS64 __STATFS_MATCHES_STATFS64 +#define STAT_IS_KERNEL_STAT 1 diff --git a/sysdeps/unix/sysv/linux/m68k/kernel_stat.h b/sysdeps/unix/sysv/linux/m68k/kernel_stat.h new file mode 100644 index 0000000000..b1bc1459f0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/m68k/kernel_stat.h @@ -0,0 +1,40 @@ +/* Definition of `struct stat' used in the kernel.. */ +struct kernel_stat + { + unsigned short int st_dev; + unsigned short int __pad1; +#define _HAVE___PAD1 + unsigned long int st_ino; + unsigned short int st_mode; + unsigned short int st_nlink; + unsigned short int st_uid; + unsigned short int st_gid; + unsigned short int st_rdev; + unsigned short int __pad2; +#define _HAVE___PAD2 + unsigned long int st_size; + unsigned long int st_blksize; + unsigned long int st_blocks; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; + unsigned long int __glibc_reserved4; +#define _HAVE___UNUSED4 + unsigned long int __glibc_reserved5; +#define _HAVE___UNUSED5 + }; + +#define _HAVE_STAT___UNUSED4 +#define _HAVE_STAT___UNUSED5 +#define _HAVE_STAT___PAD1 +#define _HAVE_STAT___PAD2 +#define _HAVE_STAT_NSEC +#define _HAVE_STAT64___PAD1 +#define _HAVE_STAT64___PAD2 +#define _HAVE_STAT64___ST_INO +#define _HAVE_STAT64_NSEC + +#define STAT_IS_KERNEL_STAT 0 +#define STAT64_IS_KERNEL_STAT64 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/aarch64/kernel_stat.h b/sysdeps/unix/sysv/linux/nios2/kernel_stat.h similarity index 78% rename from sysdeps/unix/sysv/linux/aarch64/kernel_stat.h rename to sysdeps/unix/sysv/linux/nios2/kernel_stat.h index 33ad1b622b..1af30dab6f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/nios2/kernel_stat.h @@ -1,6 +1,7 @@ -/* Internal definitions for stat functions. Linux/AARch64 version. +/* Internal definitions for stat functions. Linux/nios2. Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Chris Metcalf , 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,6 +17,6 @@ License along with the GNU C Library. If not, see . */ -#define STAT_IS_KERNEL_STAT 1 -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 +#define STAT_IS_KERNEL_STAT 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h deleted file mode 100644 index bc7390c9ff..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Definition of `struct stat' used in the kernel. - Copyright (C) 2002-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 - . */ - -#define STAT_IS_KERNEL_STAT 1 -#define STAT64_IS_KERNEL_STAT64 1 -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h b/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h new file mode 100644 index 0000000000..b1bc1459f0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h @@ -0,0 +1,40 @@ +/* Definition of `struct stat' used in the kernel.. */ +struct kernel_stat + { + unsigned short int st_dev; + unsigned short int __pad1; +#define _HAVE___PAD1 + unsigned long int st_ino; + unsigned short int st_mode; + unsigned short int st_nlink; + unsigned short int st_uid; + unsigned short int st_gid; + unsigned short int st_rdev; + unsigned short int __pad2; +#define _HAVE___PAD2 + unsigned long int st_size; + unsigned long int st_blksize; + unsigned long int st_blocks; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; + unsigned long int __glibc_reserved4; +#define _HAVE___UNUSED4 + unsigned long int __glibc_reserved5; +#define _HAVE___UNUSED5 + }; + +#define _HAVE_STAT___UNUSED4 +#define _HAVE_STAT___UNUSED5 +#define _HAVE_STAT___PAD1 +#define _HAVE_STAT___PAD2 +#define _HAVE_STAT_NSEC +#define _HAVE_STAT64___PAD1 +#define _HAVE_STAT64___PAD2 +#define _HAVE_STAT64___ST_INO +#define _HAVE_STAT64_NSEC + +#define STAT_IS_KERNEL_STAT 0 +#define STAT64_IS_KERNEL_STAT64 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h b/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h deleted file mode 100644 index ee05a15590..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Definition of `struct stat' used in the kernel. - Copyright (C) 2003-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 - . */ - -#define STAT_IS_KERNEL_STAT 1 -#define STAT64_IS_KERNEL_STAT64 1 -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 diff --git a/sysdeps/unix/sysv/linux/sh/kernel_stat.h b/sysdeps/unix/sysv/linux/sh/kernel_stat.h new file mode 100644 index 0000000000..b1bc1459f0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sh/kernel_stat.h @@ -0,0 +1,40 @@ +/* Definition of `struct stat' used in the kernel.. */ +struct kernel_stat + { + unsigned short int st_dev; + unsigned short int __pad1; +#define _HAVE___PAD1 + unsigned long int st_ino; + unsigned short int st_mode; + unsigned short int st_nlink; + unsigned short int st_uid; + unsigned short int st_gid; + unsigned short int st_rdev; + unsigned short int __pad2; +#define _HAVE___PAD2 + unsigned long int st_size; + unsigned long int st_blksize; + unsigned long int st_blocks; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; + unsigned long int __glibc_reserved4; +#define _HAVE___UNUSED4 + unsigned long int __glibc_reserved5; +#define _HAVE___UNUSED5 + }; + +#define _HAVE_STAT___UNUSED4 +#define _HAVE_STAT___UNUSED5 +#define _HAVE_STAT___PAD1 +#define _HAVE_STAT___PAD2 +#define _HAVE_STAT_NSEC +#define _HAVE_STAT64___PAD1 +#define _HAVE_STAT64___PAD2 +#define _HAVE_STAT64___ST_INO +#define _HAVE_STAT64_NSEC + +#define STAT_IS_KERNEL_STAT 0 +#define STAT64_IS_KERNEL_STAT64 1 +#define XSTAT_IS_XSTAT64 0 +#define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h b/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h deleted file mode 100644 index ee05a15590..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/kernel_stat.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Definition of `struct stat' used in the kernel. - Copyright (C) 2003-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 - . */ - -#define STAT_IS_KERNEL_STAT 1 -#define STAT64_IS_KERNEL_STAT64 1 -#define XSTAT_IS_XSTAT64 1 -#define STATFS_IS_STATFS64 1 diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index 5dfe7c5fb5..4d049d4555 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -21,12 +21,7 @@ #include #include -#if STAT_IS_KERNEL_STAT - -/* Dummy. */ -struct kernel_stat; - -#else +#if !STAT_IS_KERNEL_STAT #include