From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kedDDRa7JGnDLioAWB0awg (envelope-from ) for ; Mon, 24 Nov 2025 15:07:50 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=WMxMGks/; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2FFCC1E0B6; Mon, 24 Nov 2025 15:07:50 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 EA34A1E048 for ; Mon, 24 Nov 2025 15:07:47 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8CF743858019 for ; Mon, 24 Nov 2025 20:07:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8CF743858019 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=WMxMGks/ Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.133.114]) by sourceware.org (Postfix) with ESMTP id C93FE3858415 for ; Mon, 24 Nov 2025 19:57:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C93FE3858415 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=labware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=labware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C93FE3858415 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764014246; cv=none; b=EakPYAKlNwBz9MWibdPc5dTCpC9KMAWae3i8jaFC6KYk5+K9oEuh7aZIsZte6PQfNJDK9jWLqnao+b+yXKWbRZRBmAVL0Cb5bNeZJFv5BWvQujy4G3PGZ9qgu+2/XP8oofngpX/7c2vPwJARqdt7nAACmKDUjJ+MtzgIPJr3x4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764014246; c=relaxed/simple; bh=fWcX7HJTViuYPrWt1yS22x+qqIwiK7e26Epsmi+fTvE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ph2I+oTdoH9E7yDbVsVZEWq+Fu4sDGXzVPxq6GIg4nfY2WG77WkxgxFYk6OmvJ6Nd54ZJGhYUFjjkArbNhKtGN4bev9pcSQ0sKAgbvNf5UdRdihjMdEVyAwYPorsJ0pRKq/968gcfv3o/xiH9XuFBfwmA8Q6pjCVaKxjYnixTcs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C93FE3858415 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=labware.com; s=mimecast20220511; t=1764014246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=okiF8mwOCNTRvBCTV7Kbws2amjxfSddYsgi4ZXfuoZY=; b=WMxMGks/CuBnb+SZOG6z57RlSupsN8EDp6VJCp6IZbFZZ3bBkK6w67TWgScdUcDABFLJmK 86tq1qmvLBXn3n9/8daag05EnkQPVzRt8mjrG+slNt0V/LXquHyeWvv9+ZIjmAELZcxqND 1IjPzz1y63ziQ31KS5khhuepF4tEHDo= Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11020134.outbound.protection.outlook.com [52.101.201.134]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-30-RkCg5KZAN_6UTjinuyEMPw-1; Mon, 24 Nov 2025 14:57:25 -0500 X-MC-Unique: RkCg5KZAN_6UTjinuyEMPw-1 X-Mimecast-MFC-AGG-ID: RkCg5KZAN_6UTjinuyEMPw_1764014244 Received: from SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) by LV3PR17MB7191.namprd17.prod.outlook.com (2603:10b6:408:197::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.6; Mon, 24 Nov 2025 19:57:22 +0000 Received: from SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e]) by SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e%3]) with mapi id 15.20.9366.009; Mon, 24 Nov 2025 19:57:22 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH v2 13/13] gdb: update message in symbol_file_add_with_addrs after changes in readnow_functions Date: Mon, 24 Nov 2025 19:55:35 +0000 Message-ID: <20251124195535.2116845-14-jan.vrany@labware.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124195535.2116845-1-jan.vrany@labware.com> References: <20251124195535.2116845-1-jan.vrany@labware.com> X-ClientProxiedBy: LO6P123CA0025.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:313::18) To SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR17MB5365:EE_|LV3PR17MB7191:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bbf7f50-a6c3-435d-ec23-08de2b93aecb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zhXVMYUHxBCZwMMUvEI1lSWlxIpG6BnCYSNuwiYLciQrAHrUunmejYMLMoVM?= =?us-ascii?Q?qfD20AgNYrn7ojmOsggDbthMScrAYLYOwDKFeikfWoSZ7tpdZ4LlJYPHh9MV?= =?us-ascii?Q?yrO5AVSHlHeuzVhD87vsyVyGzypoLt+IGa079R4PxTVx/0uDIq3U4xl9QPNI?= =?us-ascii?Q?dLP6bX7GxxbyKB24zoVKDHHSpjC+4IzRoF+FDrOrBnkUPziVrp28xmdhdloO?= =?us-ascii?Q?WjJguC5hwIhrR9YVsAxW8mTMbOaCQi/lp0EWXz5aqPft/lQKeFWyG9tnJ5V3?= =?us-ascii?Q?jm8JOBXCOBfGQ9mNr4DxEdBzTCoaWKhs0EnVFM6VQJnPvtqyuWiD6vfmxWs8?= =?us-ascii?Q?hMTnGzlc5zEHkPyalRMxOkZK//3ulmtyWe0sZICFN46ZdLw24fn+fiJzSfCl?= =?us-ascii?Q?OxTJsylCe4PODPTrFc+hDUbarFgcNZMg8aBh5NQk/UrI8QiNWOHMIz4Rugpp?= =?us-ascii?Q?4IccsEENBqQzFeNFvIjNb/U9I68WpkCTQUB+a/MdfcYhb3zP4fNfeeU0jdGK?= =?us-ascii?Q?NG2aiz1tfOKYiOIbCStO/tXf9ufvV0QWVVlrq7v8nbYIRnnlviJgx2VCn/Sz?= =?us-ascii?Q?rIx3BGF+md9AF2dEt8dq6JhKQN0+1oOy0qL1QY9bDxNvFpZGvACnBOnthI0l?= =?us-ascii?Q?xYzuAzwrZMbFHBBLjJUIV0FHKVaIZTmZFKrFLQynvO9Y/MPfpYdYJurkt7XP?= =?us-ascii?Q?+v23R4dbsF12O/zwxTgzU2XC6agBi4bBPrBlEn1XWgJusvW2mwcivdQMQUUM?= =?us-ascii?Q?QO+cAGmv/Vvj+fQuJGchTJAd7/Uj0uvy3xkfkV2fIFbJga/hdtfRRzF3SsGa?= =?us-ascii?Q?FMQWo1fCgW6bfFYJplV0J3vont+0/QRrPs5bu/x97Y5U9YNiUz25dEbHwMjC?= =?us-ascii?Q?RP5fWZNqSSgUqaiJuvTEi2+XC2gWhEQpriqgt+sHmha8knNclnCvGqUREsLw?= =?us-ascii?Q?G+bgnrow5mK54zC9Rd+6Hb4PW7tidw/mq53BG6CUBSHKuMfEF4eEseBmN+gR?= =?us-ascii?Q?IviqHpPCkgkH8bKQ3MB4kel93zWtjus5JoS/RdJar/N2exxocEizsrOg3DCb?= =?us-ascii?Q?V/+HDXMA00rP6vNd3MvhKhVHf5E9LifIAvRBJlUH8o5o34ajeUgkZqXghJ4r?= =?us-ascii?Q?5pX5e8OQ2+mNNu0hesj7lAaUzWBuZWnwLvl69xatUSJC1JLNY6Td684pCvWg?= =?us-ascii?Q?HR6jyuvBqKRur3qgLpsaArHXiOxA+7cN62kzMfwkr2UjooGLAkYZly0XAiVp?= =?us-ascii?Q?rrTyBlKZqZeXcTlIxra67X9fQmDapYLybmC55VD1TMovPUj/BqpPnprYFdBx?= =?us-ascii?Q?fF0ctpUdBmNg4A/euHJpPSuFWXmMaQY7w9nO/yMERr+fv5EoyB9YoZ/KYzcv?= =?us-ascii?Q?K4jKGPhAuffmWCLOtiG+go6f4p6arTZMmD8k8hRo3gJWp9V/zNspHl6t3WQN?= =?us-ascii?Q?TIR0tUwfxldsIAZh4cTuEBsuYmPbq7Qj?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA1PR17MB5365.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/CiKQTcXhj3OgJNpPFvn5gF+JUNctoV/vfPbbFciHQnHvQ3VhSTbbb8BYNJT?= =?us-ascii?Q?L0kpzHf+w8pP5Eecbc+nxnoJwlPxi14AVEK1GDn6HbaGO+NCnIlSeTzXBn/F?= =?us-ascii?Q?kbdzXQ+K7DMqTLzFuAx3DfoKTtvb6woaKA0DFN4sa7cEmcLIHRuFjEBPNTcw?= =?us-ascii?Q?qw5tdvMSNWwjfRCfW4/Ji32OiwFRFWyHISPMRwmFqTZN51fBP7hxAIgWalC8?= =?us-ascii?Q?EAdaDA/FADuhUtzMf41rI3w/k128PIwFq5Arq6zAxFk5IahjHbuyge46LQT7?= =?us-ascii?Q?+2vGcyHJa8gNDB3GkI41g1D2tUfMjt2uELQOvELRA1QPPRDZmw8Hp7wgIs7h?= =?us-ascii?Q?7GQ9uhrUFWRtCLbqsa4Av+7SsdndxxZFk35gpJevFNf7I3YpYLZE+jxG0rYN?= =?us-ascii?Q?SlnTUWGhsyIN3ww6nJolD6FHaY3j/Qvgi8uDZdvY4zXZMW7AUFiBvKrrovFI?= =?us-ascii?Q?Il+4JlWx7ZgFy3mW2wGB8RANv4mb9pUIAia689LPnUcH9adXHPi9Mc9BuYD3?= =?us-ascii?Q?coaCFH2bwibZpPKxoXhPiZDz3GWBtWD/5TIOGWzELLdsiOACZZS9+LS88KuT?= =?us-ascii?Q?POoxx0zTSeJNtjI5cPCe9Qtg6yIhtLqQ7uunBUh8BJWWHjYmpkGGruso0zmN?= =?us-ascii?Q?MoVVBiy+4KKStS+gTE102xDlbHgpA7HMdumA8zgCvSex5IzuaooB3hqO6cgM?= =?us-ascii?Q?NckcPU4i9M8ly4WBCtSv1GQl+npIqKpv4i9oFxySf/WzhvC4N5/cmgJ6SZO/?= =?us-ascii?Q?5g0WtZ3TodpHgA7xDuH9PTqik6WLzVd9XRV54pxxaJ/It+EnxqPyLBpD/OXL?= =?us-ascii?Q?Zwv86Y/mXR9HKaDA7+yjHrG58uPgZpuT1/X3Kpk7L5qiJFGZgTjuZVVi4UcS?= =?us-ascii?Q?GnhxpvXG2aiuRSNRoXWdn69gIayDmoEq/ibA3TsyFPy9rezdLxjm5Yw7Uym5?= =?us-ascii?Q?r/Zg2iadQcs/81yLW5FKMpUMLglgsQ/3K9f5ygtNqIfDnM5OGOSEk5k8yw/o?= =?us-ascii?Q?0aus+IIMCOQLQJe7CptCrzEb1issXo4pzUZ3FyJi8tD8t5KrG31/jv8FmBsp?= =?us-ascii?Q?0uXIxoaI/ZQnv+BUmPcB6ibust1Yhn181+vo2OiVa+jjCcwB68myWGosYHQ2?= =?us-ascii?Q?M3aDmawoAy7OIbX7WM1Qg8pkXH1uLd+pRpXIR/O3q+z7m6LorK8KY29W/66j?= =?us-ascii?Q?Nb6jsirZMKM7ru50ySR0tC2bX2nou1JiAB0Zt3QIIsgiPC0gfp7FXSmxDz4S?= =?us-ascii?Q?1OSSfC6Oa2VLMo+fxF9pz5DOZmQHDwwIfpn+2x0HuJXhTsqFJHaXpO/gYeg5?= =?us-ascii?Q?ni+HIQKwk91YvDeZju9Toj9XsRNlmbAHTDrkSObWFQE0FHmLdyqFyHFHyU4+?= =?us-ascii?Q?tVQ2zRUb4LvzCI7XtbFZp3Ra49T/7d6tBG1UWqtEUt5LoLlTnJF+wtq3ArUL?= =?us-ascii?Q?tdjVnP27btMkBsSJSJ1DRtW64BnPNmMF5tENauhoje/H5FLo2SdgP80JK7BZ?= =?us-ascii?Q?x03ukza+qN/HeKPR1H4dGuVQfme+txxQSi1qO/DubC+T3Vo4X+uJ7tjlDICk?= =?us-ascii?Q?u57hU5krzjO6ics1U2p34G4GFG5DWpHwTC2S/p72?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bbf7f50-a6c3-435d-ec23-08de2b93aecb X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5365.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 19:57:22.7188 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: st2frb3q6slQw2oJkrEwipmNXLGnkwwncXFBscrKDb5ppBHjPyC0jfJCxlZAX8o8GgDCXDrlfvOMWIoxKVJEjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR17MB7191 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aC_mXPli9OdTM_JOswH7YtF1qiLvxPYZCWfUR7q6GFg_1764014244 X-Mimecast-Originator: labware.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=WINDOWS-1252 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 When loading a file with -readnow, GDB prints message like: Reading symbols from some_program... Expanding full symbols from some_program... I assume the reason for the second message ("Expanding ...") is to let the user know what's happening as symbol expansion may take time. However after commit "gdb: implement readnow_functions::expand_all_symtabs" no actual work is done in expand_all_symtabs (for objfiles with DWARF info at least) so printing "Expanding full..." felt bit odd. This commit therefore checks if there are any unexpanded CUs and if so, prints "Expanding full..." message as before. If all CUs are already expanded, say just "Expanded full...". This commit also updates a number of tests to accommodate this change. This is user-facing change. --- gdb/symfile.c | 17 +++++++++++++---- gdb/testsuite/gdb.base/bfd-errors.exp | 2 +- gdb/testsuite/gdb.base/cached-source-file.exp | 2 +- gdb/testsuite/gdb.base/code_elim.exp | 10 +++++----- gdb/testsuite/gdb.base/relocate.exp | 12 ++++++------ gdb/testsuite/gdb.base/style.exp | 2 +- gdb/testsuite/gdb.base/sym-file.exp | 4 ++-- gdb/testsuite/gdb.cp/cp-relocate.exp | 2 +- .../build-id-no-debug-warning.exp | 6 +++--- gdb/testsuite/gdb.debuginfod/crc_mismatch.exp | 4 ++-- gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp | 2 +- .../gdb.dwarf2/dw2-objfile-overlap.exp | 2 +- .../gdb.dwarf2/dw2-using-debug-str.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp | 2 +- gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp | 2 +- gdb/testsuite/gdb.multi/remove-inferiors.exp | 2 +- gdb/testsuite/gdb.server/target-exec-file.exp | 4 ++-- gdb/testsuite/gdb.threads/detach-step-over.exp | 2 +- gdb/testsuite/lib/gdb.exp | 2 +- 19 files changed, 45 insertions(+), 36 deletions(-) diff --git a/gdb/symfile.c b/gdb/symfile.c index 11388772ff5..f0f44bca8c5 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1088,11 +1088,20 @@ symbol_file_add_with_addrs (const gdb_bfd_ref_ptr &= abfd, const char *name, =20 if ((flags & OBJF_READNOW)) { - if (should_print) -=09gdb_printf (_("Expanding full symbols from %ps...\n"), -=09=09 styled_string (file_name_style.style (), name)); + if (objfile->has_unexpanded_symtabs ()) +=09{ +=09 if (should_print) +=09 gdb_printf (_ ("Expanding full symbols from %ps...\n"), +=09=09=09styled_string (file_name_style.style (), name)); =20 - objfile->expand_all_symtabs (); +=09 objfile->expand_all_symtabs (); +=09} + else +=09{ +=09 if (should_print) +=09 gdb_printf (_ ("Expanded full symbols from %ps.\n"), +=09=09=09styled_string (file_name_style.style (), name)); +=09} } =20 /* Note that we only print a message if we have no symbols and have diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base= /bfd-errors.exp index 2e3847820e9..a920b799ea9 100644 --- a/gdb/testsuite/gdb.base/bfd-errors.exp +++ b/gdb/testsuite/gdb.base/bfd-errors.exp @@ -161,7 +161,7 @@ gdb_test_multiple "add-symbol-file -readnow $binfile_li= b" \ =09incr bfd_error_count($expect_out(1,string)) =09exp_continue } - -re "Expanding full symbols from.*$gdb_prompt $" { + -re "Expand(ing|ed) full symbols from.*$gdb_prompt $" { =09pass $gdb_test_name } } diff --git a/gdb/testsuite/gdb.base/cached-source-file.exp b/gdb/testsuite/= gdb.base/cached-source-file.exp index 73d9359be9f..7637d35a832 100644 --- a/gdb/testsuite/gdb.base/cached-source-file.exp +++ b/gdb/testsuite/gdb.base/cached-source-file.exp @@ -93,7 +93,7 @@ set binregex [string_to_regexp $binfile] set re \ [multi_line \ =09 "\\`$binregex\\' has changed; re-reading symbols\\.(" \ -=09 "Expanding full symbols from $binfile\\.\\.\\.)?" \ +=09 "Expand(ing|ed) full symbols from $binfile\\.(\\.\\.)?)?" \ =09 "Starting program: ${binregex}.*"] gdb_test "run" $re "rerun program" $q y =20 diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/= code_elim.exp index 0270bc92c84..375cf1d276d 100644 --- a/gdb/testsuite/gdb.base/code_elim.exp +++ b/gdb/testsuite/gdb.base/code_elim.exp @@ -80,7 +80,7 @@ gdb_exit gdb_start =20 gdb_test "symbol-file ${binfile1}" \ -=09"Reading symbols from .*${testfile1}\\.\\.\\.(|\r\nUsing host libthread= _db library .*libthread_db.so.*\\.)" \ +=09"Reading symbols from .*${testfile1}\\.(\\.\\.)?(|\r\nUsing host libthr= ead_db library .*libthread_db.so.*\\.)" \ =09"symbol-file ${testfile1}" =20 with_test_prefix "single psymtabs" { @@ -113,13 +113,13 @@ gdb_start =20 with_test_prefix "order1" { gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \ -=09 "Reading symbols from .*${testfile1}\\.\\.\\." \ +=09 "Reading symbols from .*${testfile1}\\.(\\.\\.)?" \ =09 "add-symbol-file ${testfile1} 0x100000" \ =09 "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \ =09 "y" =20 gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .b= ss 0x220000" \ -=09 "Reading symbols from .*${testfile2}\\.\\.\\." \ +=09 "Reading symbols from .*${testfile2}\\.(\\.\\.)?" \ =09 "add-symbol-file ${testfile2} 0x200000" \ =09 "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \ =09 "y" @@ -137,13 +137,13 @@ gdb_start =20 with_test_prefix "order2" { gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .b= ss 0x220000" \ -=09 "Reading symbols from .*${testfile2}\\.\\.\\." \ +=09 "Reading symbols from .*${testfile2}\\.(\\.\\.)?" \ =09 "add-symbol-file ${testfile2} 0x200000" \ =09 "add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \ =09 "y" =20 gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \ -=09 "Reading symbols from .*${testfile1}\\.\\.\\." \ +=09 "Reading symbols from .*${testfile1}\\.(\\.\\.)?" \ =09 "add-symbol-file ${testfile1} 0x100000" \ =09 "add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \ =09 "y" diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/r= elocate.exp index db42885374c..93cca28eae3 100644 --- a/gdb/testsuite/gdb.base/relocate.exp +++ b/gdb/testsuite/gdb.base/relocate.exp @@ -114,11 +114,11 @@ gdb_test_multiple "add-symbol-file -s -section-name 0= x200 $binfile 0x100" $test # Since we're here, might as well test the 'symbol-file' command and # if its arguments can also be passed at any position. gdb_test "symbol-file -readnow $binfile" \ - "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from = ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols = from ${binfile}\.(\.\.)?" \ "symbol-file with -readnow first" clean_restart gdb_test "symbol-file $binfile -readnow" \ - "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from = ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols = from ${binfile}\.(\.\.)?" \ "symbol-file with -readnow second" gdb_test "symbol-file -readnow" \ "no symbol file name was specified" \ @@ -128,7 +128,7 @@ gdb_test "symbol-file -- -non-existent-file" \ "symbol-file with -- disables option processing" clean_restart gdb_test "symbol-file -readnow -- $binfile" \ - "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from = ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols = from ${binfile}\.(\.\.)?" \ "symbol-file with -- and -readnow" gdb_test "symbol-file -- $binfile -readnow" \ "Unrecognized argument \"-readnow\"" \ @@ -144,8 +144,9 @@ gdb_test "add-symbol-file ${binfile} 0 -s .whatever" \ "add-symbol-file missing address" =20 # Load the object file. +set readnow_re "Expand(ing|ed) full symbols from ${binfile}\.(\.\.)?" gdb_test "add-symbol-file ${binfile} 0" \ -=09"Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthr= ead_db library .*libthread_db.so.*\\.)" \ +=09"Reading symbols from .*${testfile}\\.o\\.\\.\\.(\r\n$readnow_re)?(|\r\= nUsing host libthread_db library .*libthread_db.so.*\\.)" \ =09"add-symbol-file ${testfile}.o 0" \ =09"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_= addr =3D 0x0\[\r\n\]+\\(y or n\\) " \ =09"y" @@ -198,7 +199,7 @@ gdb_test_no_output "set \$offset =3D 0x10000" =20 # Load the object file. gdb_test "add-symbol-file ${binfile} \$offset" \ -=09"Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthr= ead_db library .*libthread_db.so.*\\.)" \ +=09"Reading symbols from .*${testfile}\\.o\\.\\.\\.(\r\n$readnow_re)?(|\r\= nUsing host libthread_db library .*libthread_db.so.*\\.)" \ =09"add-symbol-file ${testfile}.o \$offset" \ =09"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_= addr =3D 0x10000\[\r\n\]+\\(y or n\\) " \ =09"y" @@ -218,7 +219,6 @@ if { "${function_foo_addr}" =3D=3D "${new_function_foo_= addr}" } { =20 set offset 0x10000 clean_restart -set readnow_re "Expanding full symbols from ${binfile}\.\.\." gdb_test "symbol-file -o $offset $binfile" \ "Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \ "symbol-file with offset" diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/styl= e.exp index 222f17ee096..2553f3adc82 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -281,7 +281,7 @@ proc run_style_tests { } { =09 set pass_re \ =09=09[multi_line \ =09=09 $pass_re \ -=09=09 "Expanding full symbols from [limited_style $quoted file]\.\.\.= "] +=09=09 "Expand(ing|ed) full symbols from [limited_style $quoted file]\= .(\.\.)?"] =09} =09gdb_test "file $binfile" \ =09 $pass_re \ diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/s= ym-file.exp index 13febdac2db..78cd725bd0b 100644 --- a/gdb/testsuite/gdb.base/sym-file.exp +++ b/gdb/testsuite/gdb.base/sym-file.exp @@ -91,7 +91,7 @@ proc do_test { remove_expr } { =20 # 3) Add the library's symbols using 'add-symbol-file'. set result [gdb_test "add-symbol-file ${lib_syms} addr" \ -=09=09 "Reading symbols from .*${lib_syms}\\.\\.\\." \ +=09=09 "Reading symbols from .*${lib_syms}\\.(\\.\\.)?" \ =09=09 "add-symbol-file ${lib_basename}.so addr" \ =09=09 "add symbol table from file \".*${lib_basename}\\.so\"\ at.*\\(y or n\\) " \ @@ -175,7 +175,7 @@ proc do_test { remove_expr } { =20 =09# Load the library's symbols. =09gdb_test "add-symbol-file ${lib_syms} addr" \ -=09 "Reading symbols from .*${lib_syms}\\.\\.\\." \ +=09 "Reading symbols from .*${lib_syms}\\.(\\.\\.)?" \ =09 "add-symbol-file ${lib_basename}.so addr" \ =09 "add symbol table from file \".*${lib_syms}\"\ at.*\\(y or n\\) " \ diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp= -relocate.exp index 836f5fb6158..493ff57085e 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -121,7 +121,7 @@ clean_restart set host_binfile [gdb_remote_download host $binfile] =20 gdb_test "add-symbol-file $host_binfile 0 -s ${func1_sec} 0x10000 -s ${fun= c2_sec} 0x20000" \ -=09"Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthr= ead_db library .*libthread_db.so.*\\.)" \ +=09"Reading symbols from .*${testfile}\\.o\\.(\\.\\.)?(|\r\nUsing host lib= thread_db library .*libthread_db.so.*\\.)" \ =09"add-symbol-file ${testfile}.o" \ =09"add symbol table from file \".*${testfile}\\.o\" at.*\\(y or n\\) " \ =09"y" diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/g= db/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp index e56538f721d..59251cad909 100644 --- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp +++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp @@ -79,7 +79,7 @@ gdb_test_no_output "set debug-file-directory ${debug_file= _directory}" \ =20 # Now load the file into GDB, and look for the warning. set debug_file_re [string_to_regexp $build_id_debug_file] -set expanding_re "\r\nExpanding full symbols from $debug_file_re\\.\\.\\." +set expanding_re "\r\nExpand(ing|ed) full symbols from $debug_file_re\\.(.= \\.\\.)?" gdb_test "file ${build_id_debug_file}" \ [multi_line \ =09 "Reading symbols from $debug_file_re\\.\\.\\.($expanding_re)?" \ @@ -98,7 +98,7 @@ with_test_prefix "check styling" { =20 =09# Now load the file into GDB, and look for the warning. =09set debug_file_re [style [string_to_regexp $build_id_debug_file] file] -=09set expanding_re "\r\nExpanding full symbols from $debug_file_re\\.\\.\= \." +=09set expanding_re "\r\nExpand(ing|ed) full symbols from $debug_file_re\\= .(\\.\\.)?" =20 =09gdb_test "file ${build_id_debug_file}" \ =09 [multi_line \ @@ -142,7 +142,7 @@ proc_with_prefix local_debuginfod { } { =09[multi_line \ =09 "Reading symbols from ${build_id_debug_file}\\.\\.\\." \ =09 "Downloading\[^\r\n\]*separate debug info for ${build_id_debug_fil= e}\\.\\.\\." \ -=09 "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding= full symbols from \[^\r\n\]+)*"] \ +=09 "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpand(in= g|ed) full symbols from \[^\r\n\]+)*"] \ =09"debuginfod running, info downloaded, no warnings" } =20 diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/= gdb.debuginfod/crc_mismatch.exp index 2771d333d46..785088e95bb 100644 --- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp +++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp @@ -47,7 +47,7 @@ remote_exec build "mkdir $debugdir" remote_exec build "mkdir -p [file dirname $debugfile]" remote_exec build "mv -f [standard_output_file ${testfile}.debug] $debugfi= le" =20 -set expanding_re "\r\nExpanding full symbols from .+\\.\\.\\." +set expanding_re "\r\nExpand(ing|ed) full symbols from .+\\.(\\.\\.)?" =20 # Test CRC mismatch is reported. if {[build_executable crc_mismatch.exp crc_mismatch-2 crc_mismatch-2.c deb= ug] !=3D -1 @@ -124,7 +124,7 @@ proc_with_prefix local_debuginfod { } { =09[multi_line \ =09 "Reading symbols from ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\= \." \ =09 "Downloading.*separate debug info for ${escapedobjdirsubdir}/crc_m= ismatch-2\\.\\.\\." \ -=09 "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding= full symbols from \[^\r\n\]+)*"] \ +=09 "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpand(in= g|ed) full symbols from \[^\r\n\]+)*"] \ =09 "debuginfod running, info downloaded, no CRC mismatch" } =20 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuit= e/gdb.dwarf2/dw2-missing-cu-tag.exp index 998b614a193..60e1cb62208 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp @@ -63,7 +63,7 @@ set pattern1 \ set pattern2 \ [multi_line \ =09 "Reading symbols from \[^\r\n\]+" \ -=09 "Expanding full symbols from \[^\r\n\]+" \ +=09 "Expand(ing|ed) full symbols from \[^\r\n\]+" \ =09 "DWARF Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"] =20 # Load the executable, we expect an error from the DWARF parser. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp b/gdb/testsui= te/gdb.dwarf2/dw2-objfile-overlap.exp index 25b3c0ee2e3..47ff7a0b9f0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp @@ -37,7 +37,7 @@ clean_restart $executable_outer set host_binfile_inner [gdb_remote_download host $binfile_inner] =20 gdb_test "add-symbol-file $host_binfile_inner outer_inner" \ -=09 {Reading symbols from .*\.\.\.} "add-symbol-file" \ +=09 {Reading symbols from .*\.(\.\.)?} "add-symbol-file" \ =09 "\r\n\t\\.text_addr =3D 0x\[0-9a-f\]+\r\n\\(y or n\\) \$" "y" =20 # Expand symtab for ${binfile_outer}. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsui= te/gdb.dwarf2/dw2-using-debug-str.exp index 5349cc4b00d..20f1abc2ca8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp @@ -158,7 +158,7 @@ set pattern1 \ set pattern2 \ [multi_line \ =09$line1 \ -=09"Expanding full symbols from \[^\r\n\]+" \ +=09"Expand(ing|ed) full symbols from \[^\r\n\]+" \ =09$dwarf_error] =20 # This pattern is hit when gcc adds an index (e.g. running with diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gd= b.dwarf2/dw2-zero-range.exp index 79e48b24af1..2f16107dc48 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp @@ -173,7 +173,7 @@ foreach_with_prefix ranges_sect {ranges rnglists} { # Expanded full symbols from ... # set complaint_re \ -=09"${complaint_re}(\r\nExpanding full .*)?" +=09"${complaint_re}(\r\nExpand(ing|ed) full .*)?" =20 set readnow_p [readnow] =20 diff --git a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp b/gdb/testsuite/g= db.dwarf2/per-bfd-sharing.exp index 0ae36128a70..453368b3842 100644 --- a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp +++ b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp @@ -63,7 +63,7 @@ proc load_binary { method } { =09gdb_test_no_output "set index-cache enabled off" } elseif { $method =3D=3D "readnow" } { =09gdb_test "file -readnow $::host_binfile" \ -=09 "Reading symbols from .*Expanding full symbols from .*" \ +=09 "Reading symbols from .*Expand(ing|ed) full symbols from .*" \ =09 "file readnow" } else { =09error "unknown method" diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/g= db.multi/remove-inferiors.exp index 52e6cb060a6..58285a57465 100644 --- a/gdb/testsuite/gdb.multi/remove-inferiors.exp +++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp @@ -50,7 +50,7 @@ proc test_remove_inferiors { } { set binfile_re [string_to_regexp ${binfile}] gdb_test "file ${binfile}" \ =09[multi_line "Reading symbols from ${binfile_re}\.\.\.(" \ -=09 "Expanding full symbols from ${binfile_re}\.\.\.)?" ] \ +=09 "Expand(ing|ed) full symbols from ${binfile_re}\.(\.\.)?)?" ] \ =09"load binary" =20 if {![runto_main]} { diff --git a/gdb/testsuite/gdb.server/target-exec-file.exp b/gdb/testsuite/= gdb.server/target-exec-file.exp index 8705217fdf8..567c6d9c7f8 100644 --- a/gdb/testsuite/gdb.server/target-exec-file.exp +++ b/gdb/testsuite/gdb.server/target-exec-file.exp @@ -118,7 +118,7 @@ gdb_test_multiple "file target:$target_exec" "run file = command" { =09exp_continue } =20 - -re "^Expanding full symbols from \[^\r\n\]+\r\n" { + -re "^Expand(ing|ed) full symbols from \[^\r\n\]+\r\n" { =09exp_continue } =20 @@ -171,7 +171,7 @@ proc start_inferior { testname expect_reread } { =09 -re "^Reading \[^\r\n\]+ from remote target\\.\\.\\.\r\n" { =09=09exp_continue =09 } -=09 -re "^Expanding full symbols from \[^\r\n\]+\\.\\.\\.\r\n" { +=09 -re "^Expand(ing|ed) full symbols from \[^\r\n\]+\\.\\.\\.\r\n" { =09=09exp_continue =09 } =09 -re "^Temporary breakpoint $::decimal at $::hex: \[^\r\n\]+\r\n" { diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite= /gdb.threads/detach-step-over.exp index 98b412cfcfd..92e3e58a97c 100644 --- a/gdb/testsuite/gdb.threads/detach-step-over.exp +++ b/gdb/testsuite/gdb.threads/detach-step-over.exp @@ -88,7 +88,7 @@ proc attach_to {testpid} { =09=09# Seen when "set debug libthread_db" is on. =09=09exp_continue =09 } -=09 -re "Reading symbols from|Expanding full symbols from" { +=09 -re "Reading symbols from|Expand(ing|ed) full symbols from" { =09=09# Prevent -readnow timeout. =09=09exp_continue =09 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 82bb511bccc..5cad00719f6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7777,7 +7777,7 @@ proc gdb_load_no_complaints { arg } { set re \ =09[multi_line \ =09 "^(Reading symbols from \[^\r\n\]*" \ -=09 ")+(Expanding full symbols from \[^\r\n\]*" \ +=09 ")+(Expand(ing|ed) full symbols from \[^\r\n\]*" \ =09 ")?$gdb_prompt $"] gdb_assert {[regexp $re $gdb_file_cmd_msg]} "No complaints" } --=20 2.51.0