From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 8ACE3385481F for ; Wed, 17 Mar 2021 20:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8ACE3385481F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-436-6XIzQkt5NVCDNxuoKD3abw-1; Wed, 17 Mar 2021 16:11:29 -0400 X-MC-Unique: 6XIzQkt5NVCDNxuoKD3abw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11F9F9CC00; Wed, 17 Mar 2021 20:11:28 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-121.ams2.redhat.com [10.36.115.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3737460C13; Wed, 17 Mar 2021 20:11:27 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Subject: Re: [PATCH 13/30] nptl: Remove open from libpthread References: <20210316200510.2135405-1-adhemerval.zanella@linaro.org> <20210316200510.2135405-14-adhemerval.zanella@linaro.org> Date: Wed, 17 Mar 2021 21:11:33 +0100 In-Reply-To: <20210316200510.2135405-14-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Tue, 16 Mar 2021 17:04:53 -0300") Message-ID: <87sg4twney.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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, 17 Mar 2021 20:11:32 -0000 * Adhemerval Zanella via Libc-alpha: > diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c > index 98db26f501..860b5607ff 100644 > --- a/sysdeps/unix/sysv/linux/open64.c > +++ b/sysdeps/unix/sysv/linux/open64.c > @@ -20,8 +20,8 @@ > #include > #include > #include > - > #include > +#include > > > #ifdef __OFF_T_MATCHES_OFF64_T > @@ -51,7 +51,6 @@ __libc_open64 (const char *file, int oflag, ...) > > strong_alias (__libc_open64, __open64) > libc_hidden_weak (__open64) > -weak_alias (__libc_open64, open64) > > #ifdef __OFF_T_MATCHES_OFF64_T > strong_alias (__libc_open64, __libc_open) > @@ -59,3 +58,11 @@ strong_alias (__libc_open64, __open) > libc_hidden_weak (__open) > weak_alias (__libc_open64, open) > #endif > + > +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) > +strong_alias (__libc_open64, __compat_open64) > +compat_symbol (libc, __compat_open64, open64, GLIBC_2_1); > +versioned_symbol (libc, __libc_open64, open64, GLIBC_2_2); > +#else > +weak_alias (__libc_open64, open64) > +#endif Please make open64@GLIBC_2.2 a compat symbol on the architectures that have it. This way, we don't have to add open64@GLIBC_2.34. Thanks, Florian