From patchwork Thu Jul 23 19:46:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40167 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 DB55C38708DC; Thu, 23 Jul 2020 19:47:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB55C38708DC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1595533636; bh=kzwsBsws+v3Bg6sOfGG4VOSYhSbHx/6/25wQx202z9g=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ZqmMuMKYShCYwjOKDdDusPv4niQVckkfsayrO/b9GWqefFQi6epDyDkU35JwbXDpR lyrtASQBC64dd4e5Mbz55n9Sy90q1qHPO3Ok7rT5ITjLXlaNUm4ze064qSMy8GmJpy Pp/5uVAd0GAkOQ1WtHhpL7BsBHUznc4JGxASacxM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 35B4C386F44A for ; Thu, 23 Jul 2020 19:47:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 35B4C386F44A Received: by mail-qk1-x741.google.com with SMTP id g26so6578541qka.3 for ; Thu, 23 Jul 2020 12:47:13 -0700 (PDT) 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=kzwsBsws+v3Bg6sOfGG4VOSYhSbHx/6/25wQx202z9g=; b=iUAS3l42zoMqDWmxrU4l7pRq/5gk/pNsB0DgllilW/HBk0fzYeRWM0ASxuR5wZKfsS hXqqNOQlrhb+mF1ExgXhA9lrx3XErIAoan/ZzihnMKwYRxKEQV75pgV7wfh+ygi9FcV3 IDVgMQ2d4RJ83o5eaInXq2VYu6FDpSX0Tg8hXEyjEZwHjPGld8VFS5Uenahap6vLnEM5 niJeeSR6Y873tvfuIetM5fTg09fSrYiIHv0eeExtjOFVFf9eOHPJ0H5QcIS48wyDR0TL I/fr4tguSplHpJcmm8WRcb5zztg9DaUF/CZUCjlYvoq8Zhj5CfZX0ipKgXXyqCSKQUCg wpdw== X-Gm-Message-State: AOAM530h9gts1j02YEakZ6Ww1l9VRbZ5zTYga4Ety69ID7Yf/IECwBnY /XjCD5A08lDIZZshjzdqLGoZSO4f17k= X-Google-Smtp-Source: ABdhPJyfYsGBgludKo/7JBex6yAIyybjDSuNU4R5VQGgGd6Fp7mtvgBc2FllSiprzxX3fJIp01+8JQ== X-Received: by 2002:a37:93c1:: with SMTP id v184mr6747313qkd.480.1595533632087; Thu, 23 Jul 2020 12:47:12 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id k56sm3570639qtk.61.2020.07.23.12.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 12:47:11 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 14/16] linux: Move {f}xstat{at} to compat symbols Date: Thu, 23 Jul 2020 16:46:39 -0300 Message-Id: <20200723194641.1949404-15-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.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.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 Cc: Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" They are not used internally anymore. Checked with a build for all affected Linux ABIs. I checked also on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/alpha/fxstat64.c | 12 ++++++++++- sysdeps/unix/sysv/linux/alpha/fxstatat64.c | 9 +++++++- sysdeps/unix/sysv/linux/alpha/lxstat64.c | 12 ++++++++++- sysdeps/unix/sysv/linux/alpha/xstat64.c | 12 ++++++++++- sysdeps/unix/sysv/linux/fxstat.c | 8 +++++++ sysdeps/unix/sysv/linux/fxstat64.c | 14 +++++++++---- sysdeps/unix/sysv/linux/fxstatat.c | 8 +++++++ sysdeps/unix/sysv/linux/fxstatat64.c | 12 ++++++++++- sysdeps/unix/sysv/linux/lxstat.c | 8 +++++++ sysdeps/unix/sysv/linux/lxstat64.c | 21 ++++++++++++------- sysdeps/unix/sysv/linux/mips/fxstat.c | 8 +++++++ sysdeps/unix/sysv/linux/mips/lxstat.c | 8 +++++++ .../unix/sysv/linux/mips/mips64/fxstat64.c | 8 +++++++ .../unix/sysv/linux/mips/mips64/fxstatat.c | 8 +++++++ .../unix/sysv/linux/mips/mips64/fxstatat64.c | 8 +++++++ .../unix/sysv/linux/mips/mips64/lxstat64.c | 8 +++++++ sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 9 +++++++- sysdeps/unix/sysv/linux/mips/xstat.c | 8 +++++++ sysdeps/unix/sysv/linux/xstat.c | 9 ++++++++ sysdeps/unix/sysv/linux/xstat64.c | 15 ++++++++----- 20 files changed, 182 insertions(+), 23 deletions(-) diff --git a/sysdeps/unix/sysv/linux/alpha/fxstat64.c b/sysdeps/unix/sysv/linux/alpha/fxstat64.c index 9d6b8eca32..bcfb55050c 100644 --- a/sysdeps/unix/sysv/linux/alpha/fxstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/fxstat64.c @@ -22,9 +22,11 @@ #include #include #include +#include /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstat64 (int vers, int fd, struct stat64 *buf) { switch (vers) @@ -42,4 +44,12 @@ __fxstat64 (int vers, int fd, struct stat64 *buf) } } } -strong_alias (__fxstat64, __fxstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__fxstat64, __fxstat_compat) +compat_symbol (libc, __fxstat_compat, __fxstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __fxstat64, __fxstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/fxstatat64.c b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c index 997fb87ac6..fa3074eeca 100644 --- a/sysdeps/unix/sysv/linux/alpha/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c @@ -22,11 +22,18 @@ #include #include #include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); } -strong_alias (__fxstatat64, __fxstatat); +strong_alias (__fxstatat64, __fxstatat_compat) +compat_symbol (libc, __fxstatat_compat, __fxstatat, GLIBC_2_4); + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/lxstat64.c b/sysdeps/unix/sysv/linux/alpha/lxstat64.c index 38f132f15e..7424b2f621 100644 --- a/sysdeps/unix/sysv/linux/alpha/lxstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/lxstat64.c @@ -23,9 +23,11 @@ #include #include #include +#include /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat64 (int vers, const char *name, struct stat64 *buf) { switch (vers) @@ -43,4 +45,12 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf) } } } -weak_alias (__lxstat64, __lxstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__lxstat64, __lxstat_compat) +compat_symbol (libc, __lxstat_compat, __lxstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __lxstat64, __lxstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/xstat64.c b/sysdeps/unix/sysv/linux/alpha/xstat64.c index c856c95dc5..59f7ddae7f 100644 --- a/sysdeps/unix/sysv/linux/alpha/xstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c @@ -23,9 +23,11 @@ #include #include #include +#include /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat64 (int vers, const char *name, struct stat64 *buf) { switch (vers) @@ -43,4 +45,12 @@ __xstat64 (int vers, const char *name, struct stat64 *buf) } } } -weak_alias (__xstat64, __xstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__xstat64, __xstat_compat) +compat_symbol (libc, __xstat_compat, __xstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __xstat64, __xstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index f78497ea92..649bb95252 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -24,9 +24,13 @@ #if !XSTAT_IS_XSTAT64 # include # include +# include + +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstat (int vers, int fd, struct stat *buf) { switch (vers) @@ -57,4 +61,8 @@ __fxstat (int vers, int fd, struct stat *buf) } } } + +compat_symbol (libc, __fxstat, __fxstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index 6ae7babccc..726dfd0ad6 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -24,10 +24,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section ___fxstat64 (int vers, int fd, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -53,16 +57,18 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf) #endif /* XSTAT_IS_XSTAT64 */ } -#include - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); +compat_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); strong_alias (___fxstat64, __old__fxstat64) compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1); #else strong_alias (___fxstat64, __fxstat64) +compat_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); #endif #if XSTAT_IS_XSTAT64 -strong_alias (__fxstat64, __fxstat); +strong_alias (___fxstat64, __fxstat_compat) +compat_symbol (libc, __fxstat_compat, __fxstat, GLIBC_2_2); #endif + +#endif /* SHLIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index 1a60fc10e3..2083e18eac 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -24,9 +24,13 @@ #if !XSTAT_IS_XSTAT64 # include # include +# include + +# if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { #if STAT_IS_KERNEL_STAT @@ -46,4 +50,8 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) return r ?: __xstat32_conv (vers, &st64, st); #endif } + +compat_symbol (libc, __fxstatat, __fxstatat, GLIBC_2_4); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index 7fe034809c..8a505451d9 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -24,10 +24,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { #if XSTAT_IS_XSTAT64 @@ -61,6 +65,12 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) #endif return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); + #if XSTAT_IS_XSTAT64 -strong_alias (__fxstatat64, __fxstatat); +strong_alias (__fxstatat64, __fxstatat_compat) +compat_symbol (libc, __fxstatat_compat, __fxstatat, GLIBC_2_4); #endif + +#endif /* SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) */ diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index 156173a4e1..f307aa4942 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -20,13 +20,17 @@ #include #include #include +#include #if !XSTAT_IS_XSTAT64 # include # include +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) + /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -58,4 +62,8 @@ __lxstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __lxstat, __lxstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c index 29bd1cdf72..660d59aea3 100644 --- a/sysdeps/unix/sysv/linux/lxstat64.c +++ b/sysdeps/unix/sysv/linux/lxstat64.c @@ -24,10 +24,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section ___lxstat64 (int vers, const char *name, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -70,17 +74,18 @@ ___lxstat64 (int vers, const char *name, struct stat64 *buf) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } -#if XSTAT_IS_XSTAT64 -weak_alias (___lxstat64, __lxstat); -weak_alias (___lxstat64, __GI___lxstat); -#endif - -#include - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); +compat_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); strong_alias (___lxstat64, __old__lxstat64) compat_symbol (libc, __old__lxstat64, __lxstat64, GLIBC_2_1); #else strong_alias (___lxstat64, __lxstat64); +compat_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); #endif + +#if XSTAT_IS_XSTAT64 +strong_alias (___lxstat64,__lxstat_compat) +compat_symbol (libc, __lxstat_compat, __lxstat, GLIBC_2_2); +#endif + +#endif /* SHLIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/mips/fxstat.c b/sysdeps/unix/sysv/linux/mips/fxstat.c index 4585c2362b..cb9f656628 100644 --- a/sysdeps/unix/sysv/linux/mips/fxstat.c +++ b/sysdeps/unix/sysv/linux/mips/fxstat.c @@ -21,9 +21,13 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstat (int vers, int fd, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __fxstat (int vers, int fd, struct stat *buf) } } } + +compat_symbol (libc, __fxstat, __fxstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/lxstat.c b/sysdeps/unix/sysv/linux/mips/lxstat.c index 62a3b15b32..ebd05cca50 100644 --- a/sysdeps/unix/sysv/linux/mips/lxstat.c +++ b/sysdeps/unix/sysv/linux/mips/lxstat.c @@ -21,9 +21,13 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __lxstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __lxstat, __lxstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c index e6c1cacd4b..855c650814 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c @@ -20,10 +20,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstat64 (int vers, int fd, struct stat64 *buf) { struct kernel_stat kbuf; @@ -31,3 +35,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf) return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __fxstat64, __fxstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c index e384dbab8b..1c1fbb02c2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c @@ -21,12 +21,20 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { struct kernel_stat kst; int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); return r ?: __xstat_conv (vers, &kst, st); } + +compat_symbol (libc, __fxstatat, __fxstatat, GLIBC_2_4); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index cfd172d301..f40a2c5aa8 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -19,10 +19,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { if (vers == _STAT_VER_LINUX) @@ -33,3 +37,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) } return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c index 0f3934f8c8..752c5284a7 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c @@ -20,12 +20,20 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat64 (int vers, const char *name, struct stat64 *buf) { struct kernel_stat kbuf; int r = INLINE_SYSCALL_CALL (lstat, name, &kbuf); return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __lxstat64, __lxstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c index 64d2952276..a620ba2f1f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -20,13 +20,20 @@ #include #include #include +#include -/* Get information about the file NAME in BUF. */ +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) +/* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat64 (int vers, const char *name, struct stat64 *buf) { struct kernel_stat kbuf; int r = INLINE_SYSCALL_CALL (stat, name, &kbuf); return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __xstat64, __xstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/xstat.c b/sysdeps/unix/sysv/linux/mips/xstat.c index d6ff5ccbe0..0748a3422d 100644 --- a/sysdeps/unix/sysv/linux/mips/xstat.c +++ b/sysdeps/unix/sysv/linux/mips/xstat.c @@ -21,9 +21,13 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __xstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __xstat, __xstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index a971e8cf6a..51329831b0 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -20,13 +20,17 @@ #include #include #include +#include #if !XSTAT_IS_XSTAT64 # include # include +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) + /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -57,4 +61,9 @@ __xstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __xstat, __xstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ + diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index e3a42966f5..4872d24694 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -24,10 +24,14 @@ #include #include #include +#include + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section ___xstat64 (int vers, const char *name, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -68,16 +72,17 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf) } #if XSTAT_IS_XSTAT64 -weak_alias (___xstat64, __xstat); -weak_alias (___xstat64, __GI___xstat); +strong_alias (___xstat64, __xstat_compat) +compat_symbol (libc, __xstat_compat, __xstat, GLIBC_2_2); #endif -#include - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); +compat_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); strong_alias (___xstat64, __old__xstat64) compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1); #else strong_alias (___xstat64, __xstat64) +compat_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); #endif + +#endif /* SHLIB_COMPAT */