From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A431138351 for ; Thu, 26 Mar 2020 17:09:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D511AE0980; Thu, 26 Mar 2020 17:09:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF3EEE0980 for ; Thu, 26 Mar 2020 17:09:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD58D34F196 for ; Thu, 26 Mar 2020 17:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A4C018F for ; Thu, 26 Mar 2020 17:09:48 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1585242551.f3771c85733121119db11be6424c8f46e21a288e.vapier@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: / X-VCS-Repository: proj/pax-utils X-VCS-Files: lddtree.py X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f3771c85733121119db11be6424c8f46e21a288e X-VCS-Branch: master Date: Thu, 26 Mar 2020 17:09:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e112c2a-65cc-436d-9561-bc99912c442d X-Archives-Hash: d45ffd45796ac86c4390c5983a00d547 commit: f3771c85733121119db11be6424c8f46e21a288e Author: Manoj Gupta google com> AuthorDate: Sun Nov 17 03:05:42 2019 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Mar 26 17:09:11 2020 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f3771c85 lddtree: Put ldso interpreter library path at end Put ldso interpreter library path at end of libpaths search. It is supposed to be a final fallback path in case library search was incomplete. As a side effect, it currently mitigates the incorrect libbfd being loaded for aarch64 standalone toolchain. Bug: https://crbug.com/917193 Reviewed-on: https://crrev.com/c/1920643 Signed-off-by: Manoj Gupta chromium.org> Signed-off-by: Mike Frysinger gentoo.org> lddtree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lddtree.py b/lddtree.py index f453d13..6e57a99 100755 --- a/lddtree.py +++ b/lddtree.py @@ -147,7 +147,8 @@ def GenerateLdsoWrapper(root, path, interp, libpaths=()): """ basedir = os.path.dirname(path) interp_dir, interp_name = os.path.split(interp) - libpaths = dedupe([interp_dir] + list(libpaths)) + # Add ldso interpreter dir to end of libpaths as a fallback library path. + libpaths = dedupe(list(libpaths) + [interp_dir]) replacements = { 'interp': os.path.join(os.path.relpath(interp_dir, basedir), interp_name),