From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa30.google.com (mail-vk1-xa30.google.com [IPv6:2607:f8b0:4864:20::a30]) by sourceware.org (Postfix) with ESMTPS id 0D2D33858C2C for ; Mon, 3 Jan 2022 13:58:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0D2D33858C2C Received: by mail-vk1-xa30.google.com with SMTP id c10so18606491vkn.2 for ; Mon, 03 Jan 2022 05:58:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=OEniV3Fz/3/imTBUWT0HdvQIzLPowQxGuKGi3wgj+Sw=; b=1uFmumsc7sGFmSPwLAM+INY4OwOnje7o/zEkkLm/LBpzKTKDhWPe+K901/gbk8fa8b IN1SH2JkNTgmwe74kOgcMGg22yBHLQqK/LT+VT/cz3mQ9uR2TPh+cz0Evv2mE6qhrg0f DzclSt29dS14Yapc365oaQr0xwbSY8+v5c7oDBMKr7k2nYlIAaxg46Fao6lYVU5Lgw3m q5iAYs6FrCayqBAMJVk4alyt1NTj2bqA8YyWJt7cZklEHumI55zVCWXyzf7imh2vcaAc tyeAAEE0T3tvHwlLa9Vxne4tCt0NZiDxhk7qQyFgjJvhvRfnzHYai7WGfZ9P7Dy0qhkf UTXg== X-Gm-Message-State: AOAM530gDwFeAvEbBDVUqp+LwAbNhywqnvLk2VLBOJaoLDTP5qIcTPtr XVZsbl4/9yBzmCUu5khOfLqX/x+uLxfnmQ== X-Google-Smtp-Source: ABdhPJz+VCVG1v2AW7tuit21BbOlVtQLS7v1X5/aZFdJhWYUnMuGuX90jJhu/UTfLNFy/2+aZlD+FQ== X-Received: by 2002:a05:6122:d11:: with SMTP id az17mr14129044vkb.22.1641218335537; Mon, 03 Jan 2022 05:58:55 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:a350:6969:50a8:eab8:8f2f? ([2804:431:c7ca:a350:6969:50a8:eab8:8f2f]) by smtp.gmail.com with ESMTPSA id d25sm7458289vsk.15.2022.01.03.05.58.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Jan 2022 05:58:55 -0800 (PST) Message-ID: <7b27dffe-c63a-fc3e-9f2b-741f96ac2b21@linaro.org> Date: Mon, 3 Jan 2022 10:58:53 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH] resolv: Do not build libanl.so for ABIs starting at 2.35 Content-Language: en-US To: Stafford Horne Cc: Florian Weimer , libc-alpha@sourceware.org References: <20211229163951.3517051-1-adhemerval.zanella@linaro.org> <87czlfb6wk.fsf@oldenburg.str.redhat.com> From: Adhemerval Zanella In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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, KAM_NUMSUBJECT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Mon, 03 Jan 2022 13:58:57 -0000 On 03/01/2022 01:53, Stafford Horne wrote: > On Thu, Dec 30, 2021 at 11:06:31AM -0300, Adhemerval Zanella via Libc-alpha wrote: >> >> >> On 29/12/2021 15:30, Florian Weimer wrote: >>> * Adhemerval Zanella: >>> >>>> --- >>>> resolv/Makefile | 11 ++++++++++- >>>> 1 file changed, 10 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/resolv/Makefile b/resolv/Makefile >>>> index 59e599535c..5606eab1fd 100644 >>>> --- a/resolv/Makefile >>>> +++ b/resolv/Makefile >>>> @@ -78,8 +78,12 @@ generate := mtrace-tst-leaks.out tst-leaks.mtrace tst-leaks2.mtrace >>>> >>>> extra-libs := libresolv libnss_dns >>>> ifeq ($(have-thread-library),yes) >>>> -extra-libs += libanl >>>> routines += gai_sigqueue >>>> +endif >>>> + >>>> +ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes) >>>> +# Empty compatibility library for old binaries. >>>> +extra-libs += libanl >>>> >>>> tests += \ >>>> tst-bug18665 \ >>>> @@ -176,6 +180,11 @@ $(libanl-routines-var) += \ >>>> libanl-routines += libanl-compat >>>> libanl-shared-only-routines += libanl-compat >>>> >>>> +# Pretend that libanl.so is a linker script, so that the symbolic link >>>> +# is not installed. >>>> +install-lib-ldscripts = libanl.so >>>> +$(inst_libdir)/libanl.so: >>>> + >>> >>> Looks okay. But the second hunk should be in a separate commit; I think >>> we should backport it. >> >> Done. > > After this make check fails on the OpenRISC port. > > tst-linkall-static fails with: > > make[3]: *** No rule to make target 'build/glibcs/or1k-linux-gnu-soft/glibc/resolv/libanl.a', needed by 'build/glibcs/or1k-linux-gnu-soft/glibc/elf/tst-linkall-static'. Stop. > > We may want to keep libanl.a around as an empty binary for build compatibility > reasons like we did with libutil. There may be builds wheck hard code -lanl, > maybe not as much as -lutil though. > > Never the less, this patch seems to fix it: I think should just remove the libanl.a reference, as per 699361795f6af8. I will fix it. > > diff --git a/elf/Makefile b/elf/Makefile > index 06bfa1642f..71bc2987df 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -1683,7 +1683,6 @@ $(objpfx)tst-linkall-static: \ > $(common-objpfx)resolv/libresolv.a \ > $(common-objpfx)login/libutil.a \ > $(common-objpfx)rt/librt.a \ > - $(common-objpfx)resolv/libanl.a \ > $(static-thread-library) > > ifeq ($(build-crypt),yes) > @@ -1704,6 +1703,12 @@ $(objpfx)tst-linkall-static: \ > endif > endif > > +# Libanl is only available up to GLIBC_2.34 > +ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes) > +$(objpfx)tst-linkall-static: \ > + $(common-objpfx)resolv/libanl.a > +endif > + > # The application depends on the DSO, and the DSO loads the plugin. > # The plugin also depends on the DSO. This creates the circular > # dependency via dlopen that we're testing to make sure works. >