From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id MXFfExVW2mrvWAwAWB0awg (envelope-from ) for ; Thu, 22 Oct 2026 14:29:41 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=S2Gt1m3X; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 4910F378002; Thu, 22 Oct 2026 14:29:41 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AF8C01E007 for ; Thu, 22 Oct 2026 14:29:40 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6551E4BA2E2A for ; Thu, 22 Oct 2026 18:29:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6551E4BA2E2A Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=S2Gt1m3X Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 0B4F34BA2E24 for ; Thu, 22 Oct 2026 18:28:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B4F34BA2E24 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0B4F34BA2E24 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1792693704; cv=none; b=hwG1nKkiRW2ymA5yv+SlTv7gryzEsHFV09nXL+toh3QJ4xNN5tq/aqsQGine/0QtZUqQb72PxkrmENLaT1/NTS0eLgfsSmQHrMwW2OgIh+qP+8ioFspNqhSUQzLucaMq3vnycFUeJhRrJS/gHCHHvV8IQDSUtvrsvrSd/wkhAco= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1792693704; c=relaxed/simple; bh=bPV1jOufOgjyAJAg5ReBvH253M9542eve26UKp5yGlE=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Yz332UuKsgl/MuETb+3hZBXt6VVIMU9FCdPesUGtC8+TdkDC06F0bYPuysNMtoPd4U0fWnKwPFSukIuhomhp5YNe0xzO7bG0oF4yd+fZT3bqD5Ni7LzBRjJscPZ0uSfRmMUlo7IIjZvoosSs3cIxC51UJxCWWP2eZgnQlZnFeds= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=S2Gt1m3X DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B4F34BA2E24 Received: by mail-ot1-x334.google.com with SMTP id 46e09a7af769-81ae6aefdceso57816a34.0 for ; Thu, 22 Oct 2026 11:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1792693703; x=1793298503; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iI2hkhqfg/MukUMm/hirPRIUcOBpWdj3CfMTHmrzvpY=; b=S2Gt1m3XA9u314jUGOvoiTtU1EKkAC6dmuGGwkTpopP6FCAlK4MKmiwMPijhYVIroL geS8KKbp1Xm/cxzmhqK3vpQX6/e5MR3A85DYtK1U0p1ttUZFtznajYLChxYZ1NqIyd8C 0UL1qhBihRDHxa7h5VIchHVxZ6hWvZwkESA9OWV+gssHNJuWfHUGHkBWCATbW082hGKx 3GVLC1mJe2Yvobuo2rtPJfzEuyZ2IMS4bMxoU8Prdb2fhlx1pf5EfR8NRJ/zPuIzRIrh fj9T+uZmRoVS/OOWGfShiHSfS4iiwo29HAHW419qsz5JqKehbRkdAySBdcMyjhOwRCk9 yDdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792693703; x=1793298503; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iI2hkhqfg/MukUMm/hirPRIUcOBpWdj3CfMTHmrzvpY=; b=a5Wu22PFr/pr5hS1aQG6vNzlo3C/acdpvDLqrsa5nQW8QYV2mFnOzGkLL6kXtwSAP0 AI12K6mGQc31FUrfckk0sarN8gx8xV2Llmzy4zRzgtFBcwj36m33Y0S+tkTYQRScCiNM M1CyaSt/hUOK0AsFrV1QHNsxY95MPUFXsZYaeFuSMYhQ6mQL3vzSW1tXUSmL5QsLQXVL g4S+1iBlne44D3MwuM80ZDNXXtWlO3IgePnfYVRA0fvj37jmZiQ/4TVEna326MvqDoiX 5wsXCDIYzBLnLOOcUCvX8l+39SUM+SQaU1lIxlozWtRw0W8cC4fr95irXF4aSQjGnfpA Au+A== X-Gm-Message-State: AFq9FYJz87Cf4hmePzGr0w6mgwruzzCUh0kxGJfqEwumYalLOACpc21g zhE7+ZC0GCYAi5iuOkGZET/HV+vw6g69lES8iFhVJY/KNltWgcOGSmC9wFIbnuvCEhGzNkGSB7q LkHP75Q== X-Gm-Gg: AYBFou07ak4Gn/xYO6VFDriq7lToH18FiltAAHqLbT6b7+hdg2+9KiO2YqAuAxL/RYP Bt6LKfm2ZsOgbA4NRGXPZ4yI8D7DMKREt1L9LsLObg+mq81EPtE2iR0mWXNE+JxC6oI5p7Jv3vu dwzUTwKENwtPMc6rryU1zJI7QL66JwpRSAEOYySnrkbi3KGhc8Ypj6jFcVKwUIu3k7SPEzV1zSD XCuYF1hnTsR5Ql1LztHKWh+jACDQUltV4XZ2y8PDwM1RUesKtcKiGr+/sn1XFDIEttOMdwJordT UPDjwVLoFsMZ3Phgh/EO4qKL8q6hKqELQ29w3b7PpYFnPOWnBwVYEXsf5fMs3/yS5b9qxUnF3P6 fkTqj7fFlvQ9a0MkHsqfOUXIoFEIKL428jIGjLyXSn2RYqiVoNmU76i2w+CzoackhROwjQzJ25H FB2osxKK3+ut6WjL/W7RjwsMHGXUKpoPnkl/GNLIaXSCuHEsekyhWzKRUBjapyH6pojI8zKHpsD tJmVMu2C30h3oiRx18+g7cS9yropWkPDHNMR75GynPDtC4A+B4/EO54sQKwYQoxg1k7MXMLBgL3 AiXX4foTeAviUQ== X-Received: by 2002:a05:6830:440e:b0:81f:da91:c984 with SMTP id 46e09a7af769-84d08900a29mr5342199a34.11.1792693703313; Thu, 22 Oct 2026 11:28:23 -0700 (PDT) Received: from [192.168.0.26] (97-122-110-129.hlrn.qwest.net. [97.122.110.129]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-84f784f3c50sm419557a34.21.2026.10.22.11.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 11:28:23 -0700 (PDT) From: Tom Tromey Date: Thu, 22 Oct 2026 12:28:15 -0600 Subject: [PATCH RFC 5/6] Call ext_lang_find_objfile_from_buildid from solib_bfd_fopen MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261022-android-apk-file-v1-5-8444bb5f832a@adacore.com> References: <20261022-android-apk-file-v1-0-8444bb5f832a@adacore.com> In-Reply-To: <20261022-android-apk-file-v1-0-8444bb5f832a@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.15.2 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Change solib_bfd_fopen to call ext_lang_find_objfile_from_buildid. This way, if the solib is not found directly, Python is given a chance to find the file. --- gdb/solib.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/solib.c b/gdb/solib.c index 7ea3084bf48..96f2597d120 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -386,7 +386,23 @@ solib_find (const char *in_pathname, int *fd) gdb_bfd_ref_ptr solib_bfd_fopen (const char *pathname, int fd) { - gdb_bfd_ref_ptr abfd (gdb_bfd_open (pathname, gnutarget, fd)); + gdb_bfd_ref_ptr abfd = gdb_bfd_open (pathname, gnutarget, fd); + if (abfd != nullptr) + return abfd; + + if (fd == -1) + { + if (is_target_filename (pathname)) + pathname += strlen (TARGET_SYSROOT_PREFIX); + + ext_lang_missing_file_result ext_result + = ext_lang_find_objfile_from_buildid (current_program_space, nullptr, + pathname); + if (ext_result.bfd () != nullptr) + abfd = ext_result.bfd (); + else if (!ext_result.filename ().empty ()) + abfd = gdb_bfd_open (ext_result.filename ().c_str (), gnutarget); + } if (abfd == NULL) error (_("Could not open `%ps' as an executable file: %s"), -- 2.56.0