From patchwork Wed Jan 22 23:33:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 37474 Received: (qmail 55943 invoked by alias); 22 Jan 2020 23:33:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 55791 invoked by uid 89); 22 Jan 2020 23:33:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa4.mentor.iphmx.com IronPort-SDR: bGBO2GCNULenGPj6PIH/tDkqAw1rZrjkiYeLIrX1LPltCABvMLA7pxiwe31rSidcREMWv3CgZR yUW3N2YM9UEgp4dn34lz3I2hCRElaXiSl8XQKD5sFFq9n/3NoRtT+RvHsO+4YsA4wkgYZfpTc9 9qJM/eybc0or9VUPyzOsBSOVVrBcA/k1/vFpt60Ozn9LkUTxr9XSrLvrmjpYzzyHEOCL7Ug7eU oXA1S+bvUqYWy4FqfmLqWSQDrZpSJjQY0sG+oje1zN8Ac03rbiIK42M8QRuFDby02uBt+PgtGX 2/A= IronPort-SDR: GtKaQASpppUWeN6s8tC1Jy40R9z5ZKkUuOUKg+IODMts3SqGEVQYY4V2942u+8mkZUHnWhT0VE uSazz3GEviTQ== Date: Wed, 22 Jan 2020 23:33:03 +0000 From: Joseph Myers To: CC: Subject: Fix cross-testing of tst-ifunc-fault-* tests Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Return-Path: joseph@codesourcery.com The tests elf/tst-ifunc-fault-bindnow and elf/tst-ifunc-fault-lazy fail in cross-testing because they run the dynamic linker directly without using the test wrapper. This patch fixes them to use the test wrapper instead. Tested that this fixes the failure of those two tests for powerpc soft-float. Reviewed-by: Siddhesh Poyarekar diff --git a/elf/Makefile b/elf/Makefile index 6c62ed611c..0c6bd926a1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1378,9 +1378,10 @@ $(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o) LDFLAGS-tst-ifunc-fault-lazy = -Wl,-z,lazy LDFLAGS-tst-ifunc-fault-bindnow = -Wl,-z,now define tst-ifunc-fault-script -( $(rtld-prefix) --verify $^ \ - && LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \ - && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused $(rtld-prefix) $^ \ +( $(test-wrapper) $(rtld-prefix) --verify $^ \ + && $(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \ + && $(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \ + $(rtld-prefix) $^ \ ) > $@; $(evaluate-test) endef $(objpfx)tst-ifunc-fault-lazy.out: $(objpfx)tst-ifunc-fault-lazy $(objpfx)ld.so