From patchwork Mon Oct 31 16:00:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 59694 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 F0CB338376A7 for ; Mon, 31 Oct 2022 16:01:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F0CB338376A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667232064; bh=bb4NPd1sJE8oCbtuNtxMRzXg6oPu/wF9y+jaizNJ3kA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BxliaU8uk5pa5T/Ba7tVi/X6XlDUyEdMYBawh9TZ077qyNuyY4w5QumZOkegdUgaZ 76aXR1a+OYVmZ5U/WtBaLyhhW2KEHgD66MkMipiVYDLWb7IhkU5X7N0VikxuZh8nP4 j3Qpwfewamd4CiqAdb/kZJiGZuRLq14lEHjQQQFA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id DD30B3851C24 for ; Mon, 31 Oct 2022 16:00:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD30B3851C24 Received: by mail-oi1-x22a.google.com with SMTP id v81so4535803oie.5 for ; Mon, 31 Oct 2022 09:00:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bb4NPd1sJE8oCbtuNtxMRzXg6oPu/wF9y+jaizNJ3kA=; b=YLpqOLGEmx7uDeR6zMgiVKrFjsV9fcJN3ZKdeiXGqf1UcVUNIZdBfDlpHLoBweeaQA AietxFAWmQBEQC4WunQIiTt2dP3YudJ9eFMxmf1u/HJFOaeSX4SQYZRdYOkRq84VoDfG 9qKgKE+ADBysYzvqp3Tv7ApcMSFXVxABrR7KEoRtSQlbQlwVRPAnM/FPTp8VcaKwmhhw V/nfY2G6eipSyho9MgdDssnv1GNb3VtbNmQ3thxe3Gkh/akp2HEkCp8Lcx0/PiNhmQlb +KGKq+UwO4bhzY4BGXJxHFZ/T86k3YXsXrDBJtVvvFJ3euSB4scI+N4Jg8mS1ZPlRjED G2jA== X-Gm-Message-State: ACrzQf169TkPhlXoXVMsyR5JzKBpy+yhm1uFaO5z20CYDgEb7ADVrH+2 rq11QqbxZNavjluMKwFHuLujN5/Wi+h7i5tp X-Google-Smtp-Source: AMsMyM6XmwPRDOYscN5Au4QvUBNsNBxPEO8p8DLr87nx1NDyWtkC81p2JGHhZ3BOQ8xzhmK97qXErg== X-Received: by 2002:a05:6808:1188:b0:351:5f92:3c52 with SMTP id j8-20020a056808118800b003515f923c52mr15562591oil.196.1667232036779; Mon, 31 Oct 2022 09:00:36 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:17c8:f12d:93ab:bc0f:dd56]) by smtp.gmail.com with ESMTPSA id v11-20020a4aaecb000000b004807de5c302sm2492826oon.17.2022.10.31.09.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 09:00:36 -0700 (PDT) To: libc-alpha@sourceware.org, Aurelien Jarno , YunQiang Su Subject: [PATCH] linux: Alias non-LFS to LFS stat function for mips and sparc (BZ #29730) Date: Mon, 31 Oct 2022 13:00:32 -0300 Message-Id: <20221031160032.1813610-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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 XSTAT_IS_XSTAT64 is not a fully correct macro to define whether stat non-LFS and LFS symbols should alias. It is used on both old compat code (__xstat*) and on kernel syscall wrapper to define whether the kernel struct needs to be adjusted to glibc exported layout. However for misp64 and sparc64, which have a different struct stat layout between glibc and kABI; still have the same layout for non-LFS and LFS struct stat. For both cases there is no need to provide a different non-LFS / non 64 bit time_t stat symbol, the default LFS is suffice. This patch adds a new STAT_IS_STAT64 to define whether LFS stat should alias to old non-LFS one (similar to how __OFF_T_MATCHES_OFF64_T is used for pread and similar symbols). Only mips64 and sparc64 have a different value than XSTAT_IS_XSTAT64, so this change should be a nop for other ABIs. This also fixes BZ#29730, where there is no need for the time_t check on non-LFS to LFS transition. Also, this is a small optimization for mips64 and sparc64 where it avoid the need to copy/paste struct stat over non-LFS to LFS and also a small code size redution. Checked with glob and io tests on mips64. --- sysdeps/unix/sysv/linux/alpha/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/arm/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/csky/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/fstat.c | 2 +- sysdeps/unix/sysv/linux/fstat64.c | 2 +- sysdeps/unix/sysv/linux/fstatat.c | 2 +- sysdeps/unix/sysv/linux/fstatat64.c | 2 +- sysdeps/unix/sysv/linux/glob.c | 2 +- sysdeps/unix/sysv/linux/glob64.c | 4 ++-- sysdeps/unix/sysv/linux/globfree.c | 2 +- sysdeps/unix/sysv/linux/globfree64.c | 2 +- sysdeps/unix/sysv/linux/hppa/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/i386/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/lstat.c | 2 +- sysdeps/unix/sysv/linux/lstat64.c | 2 +- sysdeps/unix/sysv/linux/m68k/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/microblaze/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/mips/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/nios2/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/sh/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h | 1 + sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/stat.c | 2 +- sysdeps/unix/sysv/linux/stat64.c | 2 +- 27 files changed, 30 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h index a292920969..9c31a163f0 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel_stat.h @@ -88,4 +88,5 @@ struct glibc21_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 1 +#define STAT_IS_STAT64 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 index b1bc1459f0..f199bea565 100644 --- a/sysdeps/unix/sysv/linux/arm/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/arm/kernel_stat.h @@ -37,4 +37,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/csky/kernel_stat.h b/sysdeps/unix/sysv/linux/csky/kernel_stat.h index 7970c508ef..5eebe23139 100644 --- a/sysdeps/unix/sysv/linux/csky/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/csky/kernel_stat.h @@ -18,4 +18,5 @@ #define STAT_IS_KERNEL_STAT 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/fstat.c b/sysdeps/unix/sysv/linux/fstat.c index ff3d206fb9..8767f692a0 100644 --- a/sysdeps/unix/sysv/linux/fstat.c +++ b/sysdeps/unix/sysv/linux/fstat.c @@ -21,7 +21,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 int __fstat (int fd, struct stat *buf) { diff --git a/sysdeps/unix/sysv/linux/fstat64.c b/sysdeps/unix/sysv/linux/fstat64.c index 581746ce63..2cca4b194b 100644 --- a/sysdeps/unix/sysv/linux/fstat64.c +++ b/sysdeps/unix/sysv/linux/fstat64.c @@ -58,7 +58,7 @@ __fstat64 (int fd, struct stat64 *buf) hidden_def (__fstat64) weak_alias (__fstat64, fstat64) -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 strong_alias (__fstat64, __fstat) weak_alias (__fstat64, fstat) #endif diff --git a/sysdeps/unix/sysv/linux/fstatat.c b/sysdeps/unix/sysv/linux/fstatat.c index 055fb4762e..58f3139532 100644 --- a/sysdeps/unix/sysv/linux/fstatat.c +++ b/sysdeps/unix/sysv/linux/fstatat.c @@ -20,7 +20,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 # include int diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c index 8b1a1a290d..f79e3b40b5 100644 --- a/sysdeps/unix/sysv/linux/fstatat64.c +++ b/sysdeps/unix/sysv/linux/fstatat64.c @@ -186,7 +186,7 @@ __fstatat64 (int fd, const char *file, struct stat64 *buf, int flags) hidden_def (__fstatat64) weak_alias (__fstatat64, fstatat64) -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 strong_alias (__fstatat64, __fstatat) weak_alias (__fstatat64, fstatat) strong_alias (__fstatat64, __GI___fstatat); diff --git a/sysdeps/unix/sysv/linux/glob.c b/sysdeps/unix/sysv/linux/glob.c index 7fd526a48c..9dffbf0c54 100644 --- a/sysdeps/unix/sysv/linux/glob.c +++ b/sysdeps/unix/sysv/linux/glob.c @@ -31,7 +31,7 @@ #undef glob64 #undef __glob64 -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 strong_alias (__glob, __glob64) versioned_symbol (libc, __glob64, glob64, GLIBC_2_27); #endif diff --git a/sysdeps/unix/sysv/linux/glob64.c b/sysdeps/unix/sysv/linux/glob64.c index 8845921849..36dd75cd45 100644 --- a/sysdeps/unix/sysv/linux/glob64.c +++ b/sysdeps/unix/sysv/linux/glob64.c @@ -19,7 +19,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 # include # include # include @@ -50,4 +50,4 @@ libc_hidden_def (__glob64) versioned_symbol (libc, __glob64, glob64, GLIBC_2_27); libc_hidden_ver (__glob64, glob64) # endif -#endif /* XSTAT_IS_XSTAT64 */ +#endif /* STAT_IS_STAT64 */ diff --git a/sysdeps/unix/sysv/linux/globfree.c b/sysdeps/unix/sysv/linux/globfree.c index 0deafd500b..d85101c7bf 100644 --- a/sysdeps/unix/sysv/linux/globfree.c +++ b/sysdeps/unix/sysv/linux/globfree.c @@ -24,7 +24,7 @@ #include #undef globfree64 -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 weak_alias (globfree, globfree64) libc_hidden_ver (globfree, globfree64) #endif diff --git a/sysdeps/unix/sysv/linux/globfree64.c b/sysdeps/unix/sysv/linux/globfree64.c index 3914307aa3..a172febbff 100644 --- a/sysdeps/unix/sysv/linux/globfree64.c +++ b/sysdeps/unix/sysv/linux/globfree64.c @@ -20,7 +20,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 # include diff --git a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h index e8ad135e70..97f7d04d0b 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h @@ -33,4 +33,5 @@ struct kernel_stat { #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #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 index b1bc1459f0..f199bea565 100644 --- a/sysdeps/unix/sysv/linux/i386/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/i386/kernel_stat.h @@ -37,4 +37,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index 6483c76dd9..4236391164 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -18,5 +18,6 @@ /* The default Linux ABI assumes only LFS support. */ #define XSTAT_IS_XSTAT64 1 +#define STAT_IS_STAT64 1 #define STATFS_IS_STATFS64 __STATFS_MATCHES_STATFS64 #define STAT_IS_KERNEL_STAT 1 diff --git a/sysdeps/unix/sysv/linux/lstat.c b/sysdeps/unix/sysv/linux/lstat.c index b8920d4e53..f19ff582fe 100644 --- a/sysdeps/unix/sysv/linux/lstat.c +++ b/sysdeps/unix/sysv/linux/lstat.c @@ -20,7 +20,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 int __lstat (const char *file, struct stat *buf) { diff --git a/sysdeps/unix/sysv/linux/lstat64.c b/sysdeps/unix/sysv/linux/lstat64.c index 5a3dddf4ce..fca9334e50 100644 --- a/sysdeps/unix/sysv/linux/lstat64.c +++ b/sysdeps/unix/sysv/linux/lstat64.c @@ -45,7 +45,7 @@ weak_alias (__lstat64, lstat64) #undef __lstat #undef lstat -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 strong_alias (__lstat64, __lstat) weak_alias (__lstat64, lstat) #endif diff --git a/sysdeps/unix/sysv/linux/m68k/kernel_stat.h b/sysdeps/unix/sysv/linux/m68k/kernel_stat.h index b1bc1459f0..f199bea565 100644 --- a/sysdeps/unix/sysv/linux/m68k/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/m68k/kernel_stat.h @@ -37,4 +37,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h index d8b3df26b4..735016bbdd 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h @@ -51,4 +51,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/mips/kernel_stat.h b/sysdeps/unix/sysv/linux/mips/kernel_stat.h index 19524f7ea4..494727de36 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h @@ -63,8 +63,10 @@ struct kernel_stat #define STAT64_IS_KERNEL_STAT64 0 #define XSTAT_IS_XSTAT64 0 #if _MIPS_SIM == _ABI64 +# define STAT_IS_STAT64 1 # define STATFS_IS_STATFS64 1 #else +# define STAT_IS_STAT64 0 # define STATFS_IS_STATFS64 0 #endif /* MIPS64 has unsigned 32 bit timestamps fields, so use statx as well. */ diff --git a/sysdeps/unix/sysv/linux/nios2/kernel_stat.h b/sysdeps/unix/sysv/linux/nios2/kernel_stat.h index 4bd95750a0..a0fa6af2e3 100644 --- a/sysdeps/unix/sysv/linux/nios2/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/nios2/kernel_stat.h @@ -18,4 +18,5 @@ #define STAT_IS_KERNEL_STAT 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 1 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h index 166aa44372..06e9a24c36 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h @@ -50,4 +50,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h b/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h index b1bc1459f0..f199bea565 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/kernel_stat.h @@ -37,4 +37,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/sh/kernel_stat.h b/sysdeps/unix/sysv/linux/sh/kernel_stat.h index b1bc1459f0..f199bea565 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sh/kernel_stat.h @@ -37,4 +37,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h index 4a2df42d37..0cf73b664e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h @@ -34,4 +34,5 @@ struct kernel_stat #define STAT_IS_KERNEL_STAT 0 #define STAT64_IS_KERNEL_STAT64 1 #define XSTAT_IS_XSTAT64 0 +#define STAT_IS_STAT64 0 #define STATFS_IS_STATFS64 0 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h index 29d18908da..6a55faa66e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h @@ -51,8 +51,10 @@ struct kernel_stat64 #define STAT64_IS_KERNEL_STAT64 0 #define XSTAT_IS_XSTAT64 1 #ifdef __arch64__ +# define STAT_IS_STAT64 1 # define STATFS_IS_STATFS64 1 #else +# define STAT_IS_STAT64 0 # define STATFS_IS_STATFS64 0 #endif #endif /* _KERNEL_STAT_H */ diff --git a/sysdeps/unix/sysv/linux/stat.c b/sysdeps/unix/sysv/linux/stat.c index 32cc0eab62..7709f3c989 100644 --- a/sysdeps/unix/sysv/linux/stat.c +++ b/sysdeps/unix/sysv/linux/stat.c @@ -20,7 +20,7 @@ #include #include -#if !XSTAT_IS_XSTAT64 +#if !STAT_IS_STAT64 int __stat (const char *file, struct stat *buf) { diff --git a/sysdeps/unix/sysv/linux/stat64.c b/sysdeps/unix/sysv/linux/stat64.c index a68bd349ce..7941471396 100644 --- a/sysdeps/unix/sysv/linux/stat64.c +++ b/sysdeps/unix/sysv/linux/stat64.c @@ -46,7 +46,7 @@ __stat64 (const char *file, struct stat64 *buf) hidden_def (__stat64) weak_alias (__stat64, stat64) -#if XSTAT_IS_XSTAT64 +#if STAT_IS_STAT64 strong_alias (__stat64, __stat) weak_alias (__stat64, stat) #endif