From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 48A833858D39; Tue, 20 Sep 2022 09:43:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 48A833858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663666980; bh=xqh7U2D0bEABWv5stu06rIEqU1wRdcOd7rSioaGnv2Y=; h=From:To:Subject:Date:From; b=G3EUi07Tun20ROzzurx0DnI9YfkX7PwgCd2nYaEWbkJpcgiEs6gMvTXQNOOJ7Wm28 YMvozy3T5rnrayJGkT5lSCDwiq8rBvwBGso5Rw9d9Wu8Khpv1ik8xebQfMMnAArIHO jAJRhVCkYJlxU51XAa1NZy3sFcbj/zupCMCPsT64= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.36/master] scripts/dso-ordering-test.py: Generate program run-time dependencies X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.36/master X-Git-Oldrev: 4b95b6e8bbb5a2b6856f707bf3bc3308ebef595a X-Git-Newrev: 7a3f8c8a7aeb41d4bbfeec07d0be1e92c3019919 Message-Id: <20220920094300.48A833858D39@sourceware.org> Date: Tue, 20 Sep 2022 09:43:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7a3f8c8a7aeb41d4bbfeec07d0be1e92c3019919 commit 7a3f8c8a7aeb41d4bbfeec07d0be1e92c3019919 Author: Florian Weimer Date: Tue Sep 6 07:38:10 2022 +0200 scripts/dso-ordering-test.py: Generate program run-time dependencies The main program needs to depend on all shared objects, even objects that have link-time dependencies among shared objects. Filtering out shared objects that already have an link-time dependencies is not necessary here; make will do this automatically. Reviewed-by: Adhemerval Zanella (cherry picked from commit 183d99737298bb3200f0610fdcd1c7549c8ed560) Diff: --- scripts/dso-ordering-test.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py index 2dd6bfda18..b87cf2f809 100644 --- a/scripts/dso-ordering-test.py +++ b/scripts/dso-ordering-test.py @@ -707,13 +707,12 @@ def process_testcase(t): "\t$(compile.c) $(OUTPUT_OPTION)\n") makefile.write (rule) - not_depended_objs = find_objs_not_depended_on(test_descr) - if not_depended_objs: - depstr = "" - for dep in not_depended_objs: - depstr += (" $(objpfx)" + test_subdir + "/" - + test_name + "-" + dep + ".so") - makefile.write("$(objpfx)%s.out:%s\n" % (base_test_name, depstr)) + # Ensure that all shared objects are built before running the + # test, whether there link-time dependencies or not. + depobjs = ["$(objpfx){}/{}-{}.so".format(test_subdir, test_name, dep) + for dep in test_descr.objs] + makefile.write("$(objpfx){}.out: {}\n".format( + base_test_name, " ".join(depobjs))) # Add main executable to test-srcs makefile.write("test-srcs += %s/%s\n" % (test_subdir, test_name))