From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x933.google.com (mail-ua1-x933.google.com [IPv6:2607:f8b0:4864:20::933]) by sourceware.org (Postfix) with ESMTPS id 1475C3858405 for ; Mon, 15 Nov 2021 18:59:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1475C3858405 Received: by mail-ua1-x933.google.com with SMTP id ay21so36996430uab.12 for ; Mon, 15 Nov 2021 10:59:16 -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=MUoQP5o8Wp98ok1r6O8E7zX/lRkvg0zUIiN+Vn9oEHs=; b=Xd+4CctjF2jdq0iGRYEKqTpwvmvt0M9pSDn/XjezAXhtd72us6wku10u7soZ7E/hm6 UghrCBR7oz8IqczhAOOFFVcdEGfmV/oQTRr5H08s+mjDdzIuXhvcHh1MM+joAciAwYNL RoyZOyBsarPrl/5pGS51T6S+pN2pFHIBQQYWrRbt4oznFyylWRdSK+8pNCSdm5Z0FFFh YRkuj8y4wOeZlUiKkmMSHk8NBkslAFlNU08RxmPvymm2ZWTF1bLzlkOY3iC6pdYuevVh lHfU77zjeleb4mSYfamo1c6s4+YjgXHvgTG03KzYQ0/Pz64RTNS4/J2fRGn2o/07ImID YvFw== X-Gm-Message-State: AOAM533Hjc41ls1QSmg9oqaZMw08a4LfcYOBTwRzv0N2osF3C+Tmfyhc JsfQdni3ELs5DUOGuFYPPRyz/vgKCfTVaw== X-Google-Smtp-Source: ABdhPJy04KF22jwJu9NOJIk7dQz0fK9wVkgfpRjlcr1uO8jAHM+BS/ocA7LWB+eyUd/SwnjW7K34NA== X-Received: by 2002:ab0:5b5d:: with SMTP id v29mr1580721uae.110.1637002755654; Mon, 15 Nov 2021 10:59:15 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:66dc:13f5:e2fb:5a0d:90? ([2804:431:c7ca:66dc:13f5:e2fb:5a0d:90]) by smtp.gmail.com with ESMTPSA id m15sm8960165vkl.40.2021.11.15.10.59.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Nov 2021 10:59:15 -0800 (PST) Message-ID: Date: Mon, 15 Nov 2021 15:59:13 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH v2 2/2] elf: Pre-generate Makefile fragment for DSO sorting tests [BZ #28550] Content-Language: en-US To: "H.J. Lu" , libc-alpha@sourceware.org Cc: Florian Weimer References: <20211108154211.167829-1-hjl.tools@gmail.com> <20211108154211.167829-3-hjl.tools@gmail.com> From: Adhemerval Zanella In-Reply-To: <20211108154211.167829-3-hjl.tools@gmail.com> 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, 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, 15 Nov 2021 18:59:20 -0000 On 08/11/2021 12:42, H.J. Lu via Libc-alpha wrote: > Generate Makefile fragment for DSO sorting tests at configure time. > > This partially fixes BZ #28550. I am not sure if configure.ac is the right place to generate the Makefile fragment required for tests. Can we use 'avoid-generated' instead? diff --git a/elf/Makefile b/elf/Makefile index a311c3e23c..8556105a20 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -491,6 +491,7 @@ tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \ $(objpfx)tst-unused-dep-cmp.out endif +ifndef avoid-generated # DSO sorting tests: # The dso-ordering-test.py script generates testcase source files in $(objpfx), # creating a $(objpfx)-dir for each testcase, and creates a @@ -507,6 +508,7 @@ ifeq (yes,$(have-tunables)) $(eval $(call include_dsosort_tests,dso-sort-tests-1.def)) $(eval $(call include_dsosort_tests,dso-sort-tests-2.def)) endif +endif check-abi: $(objpfx)check-abi-ld.out tests-special += $(objpfx)check-abi-ld.out > --- > configure | 11 +++++++++++ > configure.ac | 12 ++++++++++++ > elf/Makefile | 22 +++++----------------- > 3 files changed, 28 insertions(+), 17 deletions(-) > > diff --git a/configure b/configure > index 2f9adca064..91993da3b9 100755 > --- a/configure > +++ b/configure > @@ -8484,3 +8484,14 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then > $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} > fi > > + > +if test "$have_tunables" = yes; then > + test -d elf || mkdir elf > + objdir=`pwd` > + rm -f elf/dso-sort-tests.mk > + (for d in dso-sort-tests-1.def dso-sort-tests-2.def > + do > + $PYTHON $srcdir/scripts/dso-ordering-test.py \ > + --description-file $srcdir/elf/$d --objpfx $objdir/elf/ > + done) > elf/dso-sort-tests.mk > +fi > diff --git a/configure.ac b/configure.ac > index 7eb4239359..faf70b930c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1901,3 +1901,15 @@ echo "$config_vars" >> config.make;; > esac > test -d bits || mkdir bits]],[[config_vars='$config_vars']]) > AC_OUTPUT > + > +dnl Generate Makefile fragments for DSO sorting tests. > +if test "$have_tunables" = yes; then > + test -d elf || mkdir elf > + objdir=`pwd` > + rm -f elf/dso-sort-tests.mk > + (for d in dso-sort-tests-1.def dso-sort-tests-2.def > + do > + $PYTHON $srcdir/scripts/dso-ordering-test.py \ > + --description-file $srcdir/elf/$d --objpfx $objdir/elf/ > + done) > elf/dso-sort-tests.mk > +fi > diff --git a/elf/Makefile b/elf/Makefile > index 41c19668c3..6995ccaa0f 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -366,6 +366,11 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > tst-auxvalmod \ > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > > +ifeq (yes,$(have-tunables)) > +# Include Makefile fragments for DSO sorting tests. > +include $(objpfx)dso-sort-tests.mk > +endif > + > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ > @@ -486,23 +491,6 @@ tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \ > $(objpfx)tst-unused-dep-cmp.out > endif > > -# DSO sorting tests: > -# The dso-ordering-test.py script generates testcase source files in $(objpfx), > -# creating a $(objpfx)-dir for each testcase, and creates a > -# Makefile fragment to be included. > -define include_dsosort_tests > -$(objpfx)$(1).generated-makefile: $(1) > - $(PYTHON) $(..)scripts/dso-ordering-test.py \ > - --description-file $$< --objpfx $(objpfx) --output-makefile $$@ > -include $(objpfx)$(1).generated-makefile > -endef > - > -# Generate from each testcase description file > -ifeq (yes,$(have-tunables)) > -$(eval $(call include_dsosort_tests,dso-sort-tests-1.def)) > -$(eval $(call include_dsosort_tests,dso-sort-tests-2.def)) > -endif > - > check-abi: $(objpfx)check-abi-ld.out > tests-special += $(objpfx)check-abi-ld.out > update-abi: update-abi-ld >