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: 1227483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108919-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=WVTi0ftX; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4831tQ65BHz9sQp for ; Thu, 23 Jan 2020 10:33:18 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id :mime-version:content-type; q=dns; s=default; b=U+Q5SDwj+ROs0DzU /sgZN+6w0/cZPOEvweMkVXu7zhaTvPqCUBXPfnCxyjeQRoWuiFVZsgTJhTDXb4+x QbMoTekuftCldnYwynyl4M5TeA2/xh1NX6k81tZJSYIAwjMWrKRP4oJyUMdI0OOT KBhqk0QSlye3DGZIeyB74WL0oe4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id :mime-version:content-type; s=default; bh=qh/oBQbKulCsqu8MVXtUX0 2bPxs=; b=WVTi0ftXay63UQ48xvdoe05Oooyu6ispUFsz7fbebbqd+T4tlHDN12 eMvH73CPozdhvoWQn7FwR3bmg5oylaj5oBmFyIt9f9XaecKX6exSTNAEjputCZ52 jiqpceZ9fXwO1aCTG8tXDn/DD19kK2JFqQt6EjFsEN+P82h3J00J0= 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 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