From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by sourceware.org (Postfix) with ESMTPS id AFA2A395C012 for ; Wed, 20 Jan 2021 16:52:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AFA2A395C012 Received: by mail-qk1-x731.google.com with SMTP id 19so2549284qkh.3 for ; Wed, 20 Jan 2021 08:52:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=CB1SbmRmPH7Gcabbf/7cINaRNtMhdeKIy9Nug5SmxI4=; b=mC6Pu/dXinSDNDjPf7axRJb+KdXY/F/snAJA7N8L6CxJdPprX4FLYjIL22PKKxGT1N HjejzPaCIxX0vJ03498xAhfQhwDLckAAIU6TXoyHu1N3auAgRnpn6XogmCuVg53dXXXJ eDJV7sP8Jc//9L2nVZbmJaT2omTpXXulhHLEa7DK3trSXAKtPK+TEcjePK1iVFa5Nemq A82UO0Q5MXUBYddd4q5rYE0Q1iRZPAhDlh3qrPY5QrpKBu/xk8FzWZrovwmDBlHhiV/t bdwZWn2pETk7ieVQCIXmdfpyly7eYrk+GfrHjVauspZ1PC6TB3g1fMSeM/7W9eJeXtj/ qDzw== X-Gm-Message-State: AOAM530LztZhUeUh6Ey2XU57Pt97Og6J45Tj32l69NaJbAsHBTDgrHiZ fDkIuNmWYFvhkA1lAPoch+QjsN/mFO9qng== X-Google-Smtp-Source: ABdhPJzKiE/gRjFSQuPUPJRqVsiV+Qg76jf3XXr6/JKtSlRUZoZ+TSxz0W2iRI6l2p26ROD0yIDCYw== X-Received: by 2002:a37:a656:: with SMTP id p83mr10472433qke.208.1611161562116; Wed, 20 Jan 2021 08:52:42 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id d26sm1451998qtw.58.2021.01.20.08.52.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jan 2021 08:52:41 -0800 (PST) Subject: Re: [PATCH] Revert "linux: Move {f}xstat{at} to compat symbols" for static build From: Adhemerval Zanella To: libc-alpha@sourceware.org, Andreas Schwab , Florian Weimer References: <20201229194929.130589-1-adhemerval.zanella@linaro.org> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Wed, 20 Jan 2021 13:52:38 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201229194929.130589-1-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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-List-Received-Date: Wed, 20 Jan 2021 16:52:45 -0000 Florian, Do we want this for 2.33? If so it would be good if someone could take a look and check if I am missing something here. On 29/12/2020 16:49, Adhemerval Zanella wrote: > This reverts commit 20b39d59467b0c1d858e89ded8b0cebe55e22f60 for static > library. This avoids the need to rebuild the world for the case where > libstdc++ (and potentially other libraries) are linked to a old glibc. > > To avoid requering to provide xstat symbols for newer ABIs (such as > riscv32) a new LIB_COMPAT macro is added. It is similar to SHLIB_COMPAT > but also works for static case (thus evaluating similar to SHLIB_COMPAT > for both shared and static case). > > Checked with a check-abi on all affected ABIs. I also check if the > static library does contains the xstat symbols. > --- > include/shlib-compat.h | 23 ++++++++++++++--------- > sysdeps/mach/hurd/fxstat.c | 5 ----- > sysdeps/mach/hurd/fxstatat.c | 3 +-- > sysdeps/mach/hurd/fxstatat64.c | 3 +-- > sysdeps/mach/hurd/lxstat64.c | 3 +-- > sysdeps/mach/hurd/xstat.c | 2 +- > sysdeps/unix/sysv/linux/fxstat.c | 4 ++-- > sysdeps/unix/sysv/linux/fxstat64.c | 4 ++-- > sysdeps/unix/sysv/linux/fxstatat.c | 4 ++-- > sysdeps/unix/sysv/linux/fxstatat64.c | 4 ++-- > sysdeps/unix/sysv/linux/lxstat.c | 2 +- > sysdeps/unix/sysv/linux/lxstat64.c | 4 ++-- > sysdeps/unix/sysv/linux/xstat.c | 6 +++--- > sysdeps/unix/sysv/linux/xstat64.c | 5 +++-- > 14 files changed, 35 insertions(+), 37 deletions(-) > > diff --git a/include/shlib-compat.h b/include/shlib-compat.h > index b58281857a..d6dae3bea9 100644 > --- a/include/shlib-compat.h > +++ b/include/shlib-compat.h > @@ -21,8 +21,6 @@ > > # include > > -#ifdef SHARED > - > /* The file abi-versions.h (generated by scripts/abi-versions.awk) defines > symbols like `ABI_libm_GLIBC_2_0' for each version set in the source > code for each library. For a version set that is subsumed by a later > @@ -34,17 +32,24 @@ > when the two version sets named are in fact two different ABIs we are > supporting. If these do not differ, then there is no need to compile in > extra code to support this version set where it has been superseded by a > - newer version. The compatibility code should be conditionalized with > - e.g. `#if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_2)' for code introduced > - in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version. */ > - > -# define SHLIB_COMPAT(lib, introduced, obsoleted) \ > - _SHLIB_COMPAT (lib, introduced, obsoleted) > -# define _SHLIB_COMPAT(lib, introduced, obsoleted) \ > + newer version. */ > +#define LIB_COMPAT(lib, introduced, obsoleted) \ > + _LIB_COMPAT (lib, introduced, obsoleted) > +#define _LIB_COMPAT(lib, introduced, obsoleted) \ > (IS_IN (lib) \ > && (!(ABI_##lib##_##obsoleted - 0) \ > || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))) > > +#ifdef SHARED > + > +/* Similar to LIB_COMPAT, but evaluate to 0 for static build. The > + compatibility code should be conditionalized with e.g. > + `#if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_2)' for code introduced > + in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version. */ > + > +# define SHLIB_COMPAT(lib, introduced, obsoleted) \ > + _LIB_COMPAT (lib, introduced, obsoleted) > + > /* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to > the version set name to use for e.g. symbols first introduced into > libm in the GLIBC_2.1 version. Definitions of symbols with explicit > diff --git a/sysdeps/mach/hurd/fxstat.c b/sysdeps/mach/hurd/fxstat.c > index 3201bb8cf1..e7e4b6e65e 100644 > --- a/sysdeps/mach/hurd/fxstat.c > +++ b/sysdeps/mach/hurd/fxstat.c > @@ -19,9 +19,6 @@ > #include > #include > #include > -#include > - > -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file descriptor FD in BUF. */ > int > @@ -33,5 +30,3 @@ __fxstat (int vers, int fd, struct stat *buf) > return __fstat (fd, buf); > } > weak_alias (__fxstat, _fxstat) > - > -#endif > diff --git a/sysdeps/mach/hurd/fxstatat.c b/sysdeps/mach/hurd/fxstatat.c > index b71ab9fad5..b7f6ca742a 100644 > --- a/sysdeps/mach/hurd/fxstatat.c > +++ b/sysdeps/mach/hurd/fxstatat.c > @@ -22,7 +22,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > > int > __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag) > @@ -32,5 +32,4 @@ __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag) > > return __fstatat (fd, filename, buf, flag); > } > - > #endif > diff --git a/sysdeps/mach/hurd/fxstatat64.c b/sysdeps/mach/hurd/fxstatat64.c > index f0c171f64c..8f401ddff2 100644 > --- a/sysdeps/mach/hurd/fxstatat64.c > +++ b/sysdeps/mach/hurd/fxstatat64.c > @@ -23,7 +23,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > > /* Get information about the file descriptor FD in BUF. */ > int > @@ -35,5 +35,4 @@ __fxstatat64 (int vers, int fd, const char *filename, struct stat64 *buf, > > return __fstatat64 (fd, filename, buf, flag); > } > - > #endif > diff --git a/sysdeps/mach/hurd/lxstat64.c b/sysdeps/mach/hurd/lxstat64.c > index 7059bceb11..4975044ac3 100644 > --- a/sysdeps/mach/hurd/lxstat64.c > +++ b/sysdeps/mach/hurd/lxstat64.c > @@ -22,7 +22,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) > > /* Get information about the file descriptor FD in BUF. */ > int > @@ -33,5 +33,4 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf) > > return __lstat64 (file, buf); > } > - > #endif > diff --git a/sysdeps/mach/hurd/xstat.c b/sysdeps/mach/hurd/xstat.c > index 8d56fe3c44..03b86ccb24 100644 > --- a/sysdeps/mach/hurd/xstat.c > +++ b/sysdeps/mach/hurd/xstat.c > @@ -20,7 +20,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get file information about FILE in BUF. */ > int > diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c > index 528eedc272..0b89250b8b 100644 > --- a/sysdeps/unix/sysv/linux/fxstat.c > +++ b/sysdeps/unix/sysv/linux/fxstat.c > @@ -26,7 +26,7 @@ > # include > # include > > -# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +# if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file FD in BUF. */ > int > @@ -61,6 +61,6 @@ __fxstat (int vers, int fd, struct stat *buf) > } > } > > -# endif /* SHLIB_COMPAT */ > +# endif /* LIB_COMPAT */ > > #endif /* XSTAT_IS_XSTAT64 */ > diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c > index 9471d0be45..177233d759 100644 > --- a/sysdeps/unix/sysv/linux/fxstat64.c > +++ b/sysdeps/unix/sysv/linux/fxstat64.c > @@ -26,7 +26,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file FD in BUF. */ > > @@ -78,4 +78,4 @@ strong_alias (___fxstat64, __fxstat64) > strong_alias (___fxstat64, __fxstat) > #endif > > -#endif /* SHLIB_COMPAT */ > +#endif /* LIB_COMPAT */ > diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c > index bd78971dea..78856742ef 100644 > --- a/sysdeps/unix/sysv/linux/fxstatat.c > +++ b/sysdeps/unix/sysv/linux/fxstatat.c > @@ -26,7 +26,7 @@ > # include > # include > > -# if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > +# if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > > /* Get information about the file FD in BUF. */ > int > @@ -50,6 +50,6 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) > #endif > } > > -# endif /* SHLIB_COMPAT */ > +# endif /* LIB_COMPAT */ > > #endif /* XSTAT_IS_XSTAT64 */ > diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c > index 091da83f1f..f23f877109 100644 > --- a/sysdeps/unix/sysv/linux/fxstatat64.c > +++ b/sysdeps/unix/sysv/linux/fxstatat64.c > @@ -26,7 +26,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) > > /* Get information about the file FD in BUF. */ > > @@ -69,4 +69,4 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) > strong_alias (__fxstatat64, __fxstatat) > #endif > > -#endif /* SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) */ > +#endif /* LIB_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 c7d4507d7c..a11f58b453 100644 > --- a/sysdeps/unix/sysv/linux/lxstat.c > +++ b/sysdeps/unix/sysv/linux/lxstat.c > @@ -26,7 +26,7 @@ > # include > # include > > -# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +# if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file NAME in BUF. */ > int > diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c > index 74e11f3467..4d9d058d4b 100644 > --- a/sysdeps/unix/sysv/linux/lxstat64.c > +++ b/sysdeps/unix/sysv/linux/lxstat64.c > @@ -26,7 +26,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) > > /* Get information about the file NAME in BUF. */ > > @@ -95,4 +95,4 @@ strong_alias (___lxstat64, __lxstat64); > strong_alias (___lxstat64,__lxstat) > #endif > > -#endif /* SHLIB_COMPAT */ > +#endif /* LIB_COMPAT */ > diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c > index 87556af616..ff95479612 100644 > --- a/sysdeps/unix/sysv/linux/xstat.c > +++ b/sysdeps/unix/sysv/linux/xstat.c > @@ -20,13 +20,13 @@ > #include > #include > #include > -#include > > #if !XSTAT_IS_XSTAT64 > # include > # include > +# include > > -# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +# if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file NAME in BUF. */ > int > @@ -61,6 +61,6 @@ __xstat (int vers, const char *name, struct stat *buf) > } > } > > -# endif /* SHLIB_COMPAT */ > +# endif /* LIB_COMPAT */ > > #endif /* XSTAT_IS_XSTAT64 */ > diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c > index ec912fd2b9..9b05d1528b 100644 > --- a/sysdeps/unix/sysv/linux/xstat64.c > +++ b/sysdeps/unix/sysv/linux/xstat64.c > @@ -26,7 +26,7 @@ > #include > #include > > -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > +#if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) > > /* Get information about the file NAME in BUF. */ > > @@ -92,4 +92,5 @@ compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1); > strong_alias (___xstat64, __xstat64) > #endif > > -#endif /* SHLIB_COMPAT */ > + > +#endif /* LIB_COMPAT */ >