From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Pr05JPw/F2pH5iAAWB0awg (envelope-from ) for ; Wed, 27 May 2026 15:03:24 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O4ioaySG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=/fex1V1S; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qxlvsB7c; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4JvhPi1M; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 80FD71E024; Wed, 27 May 2026 15:03:24 -0400 (EDT) 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 vm01.sourceware.org (vm01.sourceware.org [38.145.34.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 E01C71E024 for ; Wed, 27 May 2026 15:03:21 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 95E924BA23C4 for ; Wed, 27 May 2026 19:03:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95E924BA23C4 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O4ioaySG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=/fex1V1S; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qxlvsB7c; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4JvhPi1M Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id EB8834BA2E09 for ; Wed, 27 May 2026 19:02:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB8834BA2E09 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EB8834BA2E09 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779908550; cv=none; b=H1RtZwuhyOrBs0xDKnDhS0cCh4tXd1iLMSOFMEfwDbo/t+9Xs0c4dd+85Yw8toKsFdsRN3X29+bg1KL/nrrOOEPmWFo0OQjn8+3vyGWlJc4HgNx/yG2b1zaWOzsAYtMT//v0dIXy1VGzurK8WrhOxy9lpoCOti3MO6k/e7bmkSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779908550; c=relaxed/simple; bh=uzUgw2Q0tqQXUEiiWCUNcdBA0D1BDcN2Fi/B3Ranefc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=pVENUxFLA67vQAL/EZ9fAPCPk3kDJSI29vNH6UIt0Kc+b9MabtuIM60Zw0qqG1rY8OdNPgygVQ4iKMuJ+UPdUCZq+h1IkXs8Xzlq/SuyKLS6Cp+YtKQRUFLRmXkbRpsC23+vRRclLCsGIZrSUre1Gj4jzSVjroRg4rxRbItPisk= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O4ioaySG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=/fex1V1S; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qxlvsB7c; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4JvhPi1M DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB8834BA2E09 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D7E40670B4 for ; Wed, 27 May 2026 19:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779908549; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njrhp9tjYPKXYkZF+BVNInhb/D9AMstOdHTg0MPUAek=; b=O4ioaySGd8zwEjrJ2XLIt50A864P3l8dmFDVZuz6YT6SIrWKrBQ3qcCLp+59edeJyC8QP+ 5ElRLGw//5raCMMNqf7YbPbeOHJiJv6gjSEnJLKyt8Y1azqjOZ12Yoc76KBx0tNxeV4WGS m7VP0/79R1+MtjpFAVhup9kaJHmXO4k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779908549; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njrhp9tjYPKXYkZF+BVNInhb/D9AMstOdHTg0MPUAek=; b=/fex1V1ShAP5z9lSLWwlsCu/X0Dylo96wf7b4Tin1s7sYgJaof7QGPVTIGVtuG41oplEyK pfqxa6hCdfc3qCCg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779908548; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njrhp9tjYPKXYkZF+BVNInhb/D9AMstOdHTg0MPUAek=; b=qxlvsB7cAN2BvbpfCF7qJ9x23+sTRuYA7JlNXqwnIiEN87boYnEiqlCiV533aqqWlVRShq ml4eh+iF2cyIrvHQloaXZQT3hOCXVUhoogBeAOJF1CT6w6qwLZ8aDCArdhUsnksfIFfSUD WwlYY4utmIH7FkjkCnI7/FGq2mK1+zQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779908548; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njrhp9tjYPKXYkZF+BVNInhb/D9AMstOdHTg0MPUAek=; b=4JvhPi1MBMYPFnNlO3ZiIWwxuWc4PqfHq1SIb8am7cdh7PUCI4tpIv+DqPgd25DrXGfzlX kAYjn6kaYk1wUUAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BF8395A996 for ; Wed, 27 May 2026 19:02:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id uO1tLcQ/F2oldgAAD6G6ig (envelope-from ) for ; Wed, 27 May 2026 19:02:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/2] [gdb] Add gdb_bfd_check_format and gdb_bfd_check_format_matches Date: Wed, 27 May 2026 21:02:27 +0200 Message-ID: <20260527190228.3656310-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260527190228.3656310-1-tdevries@suse.de> References: <20260527190228.3656310-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 Add new bfd wrappers: - gdb_bfd_check_format for bfd_check_format, and - gdb_bfd_check_format_matches for bfd_check_format_matches. and run this command to use them: ... $ sed -i 's/bfd_check_format/gdb_bfd_check_format/' \ $(find gdb* -type f | egrep -v "/testsuite/|ChangeLog") ... No functional changes. --- gdb/build-id.c | 4 ++-- gdb/cli/cli-dump.c | 2 +- gdb/compile/compile-object-load.c | 2 +- gdb/corelow.c | 8 ++++---- gdb/dwarf2/dwz.c | 2 +- gdb/dwarf2/read.c | 2 +- gdb/exec.c | 2 +- gdb/gdb_bfd.c | 16 ++++++++++++++++ gdb/gdb_bfd.h | 11 ++++++++++- gdb/i386-darwin-tdep.c | 2 +- gdb/jit.c | 2 +- gdb/machoread.c | 6 +++--- gdb/minidebug.c | 2 +- gdb/solib-aix.c | 6 +++--- gdb/solib-rocm.c | 2 +- gdb/solib.c | 4 ++-- gdb/symfile-mem.c | 2 +- gdb/symfile.c | 6 +++--- gdb/windows-nat.c | 2 +- 19 files changed, 54 insertions(+), 29 deletions(-) diff --git a/gdb/build-id.c b/gdb/build-id.c index b49216d4cad..123d87e519c 100644 --- a/gdb/build-id.c +++ b/gdb/build-id.c @@ -42,8 +42,8 @@ build_id_bfd_get (bfd *abfd) if (abfd == nullptr) return nullptr; - if (!bfd_check_format (abfd, bfd_object) - && !bfd_check_format (abfd, bfd_core)) + if (!gdb_bfd_check_format (abfd, bfd_object) + && !gdb_bfd_check_format (abfd, bfd_core)) return NULL; if (abfd->build_id != NULL) diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index 66ab5922693..6c6abaa9de3 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -89,7 +89,7 @@ bfd_openr_or_error (const char *filename, const char *target) styled_string (file_name_style.style (), filename), bfd_errmsg (bfd_get_error ())); - if (!bfd_check_format (ibfd.get (), bfd_object)) + if (!gdb_bfd_check_format (ibfd.get (), bfd_object)) error (_("'%ps' is not a recognized file format."), styled_string (file_name_style.style (), filename)); diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c index 4ea924582fb..20e4c3e51ce 100644 --- a/gdb/compile/compile-object-load.c +++ b/gdb/compile/compile-object-load.c @@ -621,7 +621,7 @@ compile_object_load (const compile_file_names &file_names, styled_string (file_name_style.style (), filename.get ()), bfd_errmsg (bfd_get_error ())); - if (!bfd_check_format_matches (abfd.get (), bfd_object, &matching)) + if (!gdb_bfd_check_format_matches (abfd.get (), bfd_object, &matching)) error (_("\"%ps\": not in loadable format: %s"), styled_string (file_name_style.style (), filename.get ()), gdb_bfd_errmsg (bfd_get_error (), matching).c_str ()); diff --git a/gdb/corelow.c b/gdb/corelow.c index 008da68155f..819e7cae6f9 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -450,7 +450,7 @@ core_target::build_file_mappings () = gdb_bfd_open (expanded_fname.get (), gnutarget); if (tmp_bfd != nullptr - && bfd_check_format (tmp_bfd.get (), bfd_object) + && gdb_bfd_check_format (tmp_bfd.get (), bfd_object) && build_id_bfd_get (tmp_bfd.get ()) != nullptr) { /* The newly opened TMP_BFD has a build-id, and this mapped @@ -469,7 +469,7 @@ core_target::build_file_mappings () if ((expanded_fname == nullptr || abfd == nullptr - || !bfd_check_format (abfd.get (), bfd_object)) + || !gdb_bfd_check_format (abfd.get (), bfd_object)) && file_data.build_id != nullptr) { abfd = find_objfile_by_build_id (current_program_space, @@ -492,7 +492,7 @@ core_target::build_file_mappings () if (expanded_fname == nullptr || abfd == nullptr - || !bfd_check_format (abfd.get (), bfd_object)) + || !gdb_bfd_check_format (abfd.get (), bfd_object)) { /* If ABFD was opened, but the wrong format, close it now. */ abfd = nullptr; @@ -1071,7 +1071,7 @@ core_target_open (const char *arg, int from_tty) if (temp_bfd == NULL) perror_with_name (filename.c_str ()); - if (!bfd_check_format (temp_bfd.get (), bfd_core)) + if (!gdb_bfd_check_format (temp_bfd.get (), bfd_core)) { /* Do it after the err msg */ /* FIXME: should be checking for errors from bfd_close (for one diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c index 8f3d52567ec..e61e7fd7605 100644 --- a/gdb/dwarf2/dwz.c +++ b/gdb/dwarf2/dwz.c @@ -171,7 +171,7 @@ get_debug_sup_info (bfd *abfd, static bool verify_id (bfd *abfd, size_t len, const bfd_byte *buildid, bool dwarf5) { - if (!bfd_check_format (abfd, bfd_object)) + if (!gdb_bfd_check_format (abfd, bfd_object)) return false; if (dwarf5) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index c761b732819..8067af5f52e 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6750,7 +6750,7 @@ try_open_dwop_file (dwarf2_per_bfd *per_bfd, const char *file_name, int is_dwp, static gdb::mutex mutex; gdb::lock_guard lock (mutex); - if (!bfd_check_format (sym_bfd.get (), bfd_object)) + if (!gdb_bfd_check_format (sym_bfd.get (), bfd_object)) return NULL; /* Success. Record the bfd as having been included by the objfile's bfd. diff --git a/gdb/exec.c b/gdb/exec.c index 873686e6286..36ec45c14bc 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -479,7 +479,7 @@ exec_file_attach (const char *filename, int from_tty) (make_unique_xstrdup (gdb_realpath_keepfile (scratch_pathname).c_str ())); - if (!bfd_check_format_matches (current_program_space->exec_bfd (), + if (!gdb_bfd_check_format_matches (current_program_space->exec_bfd (), bfd_object, &matching)) { /* Make sure to close exec_bfd, or else "run" might try to use diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 952875955ad..7a845d6e04b 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -1200,6 +1200,22 @@ gdb_bfd_canonicalize_symtab (bfd *abfd, bool should_throw) symbol_table.size () - 1); } +/* See gdb_bfd.h. */ + +bool +gdb_bfd_check_format (bfd *abfd, bfd_format format) +{ + return bfd_check_format (abfd, format); +} + +/* See gdb_bfd.h. */ + +bool +gdb_bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) +{ + return bfd_check_format_matches (abfd, format, matching); +} + /* Implement the 'maint info bfd' command. */ static void diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index 69bfa3011aa..ff9f2337e6e 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -268,7 +268,7 @@ extern long gdb_bfd_get_mtime (bfd *abfd) /* A wrapper for bfd_errmsg to produce a more helpful error message in the case of bfd_error_file_ambiguously recognized. MATCHING, if non-NULL, is the corresponding argument to - bfd_check_format_matches, and will be freed. */ + gdb_bfd_check_format_matches, and will be freed. */ extern std::string gdb_bfd_errmsg (bfd_error_type error_tag, char **matching); @@ -289,4 +289,13 @@ extern void gdb_bfd_init (); extern gdb::array_view gdb_bfd_canonicalize_symtab (bfd *abfd, bool should_throw = true); +/* A wrapper for bfd_check_format. */ + +extern bool gdb_bfd_check_format (bfd *abfd, bfd_format format); + +/* A wrapper for bfd_check_format_matches. */ + +extern bool gdb_bfd_check_format_matches (bfd *abfd, bfd_format format, + char ***matching); + #endif /* GDB_GDB_BFD_H */ diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c index b9ea7cb3f36..f7512eaf9a3 100644 --- a/gdb/i386-darwin-tdep.c +++ b/gdb/i386-darwin-tdep.c @@ -277,7 +277,7 @@ i386_darwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) static enum gdb_osabi i386_mach_o_osabi_sniffer (bfd *abfd) { - if (!bfd_check_format (abfd, bfd_object)) + if (!gdb_bfd_check_format (abfd, bfd_object)) return GDB_OSABI_UNKNOWN; if (bfd_get_arch (abfd) == bfd_arch_i386) diff --git a/gdb/jit.c b/gdb/jit.c index 5fa3869316c..251e8331c4a 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -782,7 +782,7 @@ jit_bfd_try_read_symtab (struct jit_code_entry *code_entry, /* Check the format. NOTE: This initializes important data that GDB uses! We would segfault later without this line. */ - if (!bfd_check_format (nbfd.get (), bfd_object)) + if (!gdb_bfd_check_format (nbfd.get (), bfd_object)) { gdb_printf (gdb_stderr, _("\ JITed symbol file is not an object file, ignoring it.\n")); diff --git a/gdb/machoread.c b/gdb/machoread.c index 6bd063a89e9..d273ec2ef90 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -422,7 +422,7 @@ macho_add_oso_symfile (oso_el *oso, const gdb_bfd_ref_ptr &abfd, macho_debug (0, _("Loading debugging symbols from oso: %s\n"), oso->name); - if (!bfd_check_format (abfd.get (), bfd_object)) + if (!gdb_bfd_check_format (abfd.get (), bfd_object)) { warning (_("`%s': can't read symbols: %s."), oso->name, bfd_errmsg (bfd_get_error ())); @@ -634,7 +634,7 @@ macho_symfile_read_all_oso (std::vector *oso_vector_ptr, ix = last_ix; continue; } - if (!bfd_check_format (archive_bfd.get (), bfd_archive)) + if (!gdb_bfd_check_format (archive_bfd.get (), bfd_archive)) { warning (_("OSO archive file \"%s\" not an archive."), archive_name.c_str ()); @@ -748,7 +748,7 @@ macho_check_dsym (struct objfile *objfile, std::string *filenamep) return NULL; } - if (!bfd_check_format (dsym_bfd.get (), bfd_object)) + if (!gdb_bfd_check_format (dsym_bfd.get (), bfd_object)) { warning (_("bad dsym file format: %s"), bfd_errmsg (bfd_get_error ())); return NULL; diff --git a/gdb/minidebug.c b/gdb/minidebug.c index 10222ec233d..8c84b7c9664 100644 --- a/gdb/minidebug.c +++ b/gdb/minidebug.c @@ -251,7 +251,7 @@ find_separate_debug_file_in_section (struct objfile *objfile) if (abfd == NULL) return NULL; - if (!bfd_check_format (abfd.get (), bfd_object)) + if (!gdb_bfd_check_format (abfd.get (), bfd_object)) { warning (_("Cannot parse .gnu_debugdata section; not a BFD object")); return NULL; diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index 4f029529106..70576065121 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -547,10 +547,10 @@ aix_solib_ops::bfd_open (const char *pathname) const return NULL; } - if (bfd_check_format (archive_bfd.get (), bfd_object)) + if (gdb_bfd_check_format (archive_bfd.get (), bfd_object)) return archive_bfd; - if (! bfd_check_format (archive_bfd.get (), bfd_archive)) + if (! gdb_bfd_check_format (archive_bfd.get (), bfd_archive)) { warning (_("\"%ps\": not in executable format: %s."), styled_string (file_name_style.style (), filename.c_str ()), @@ -590,7 +590,7 @@ aix_solib_ops::bfd_open (const char *pathname) const return NULL; } - if (! bfd_check_format (object_bfd.get (), bfd_object)) + if (! gdb_bfd_check_format (object_bfd.get (), bfd_object)) { warning (_("%ps(%s): not in object format: %s."), styled_string (file_name_style.style (), filename.c_str ()), diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 38904b9633c..34cb2bb9e57 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -677,7 +677,7 @@ rocm_solib_ops::bfd_open (const char *pathname) const bfd_errmsg (bfd_get_error ())); /* Check bfd format. */ - if (!bfd_check_format (abfd.get (), bfd_object)) + if (!gdb_bfd_check_format (abfd.get (), bfd_object)) error (_("`%s': not in executable format: %s"), bfd_get_filename (abfd.get ()), bfd_errmsg (bfd_get_error ())); diff --git a/gdb/solib.c b/gdb/solib.c index 158c58d9689..d92d0dd9a3d 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -419,7 +419,7 @@ solib_bfd_open (const char *pathname) gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname.get (), found_file)); /* Check bfd format. */ - if (!bfd_check_format (abfd.get (), bfd_object)) + if (!gdb_bfd_check_format (abfd.get (), bfd_object)) error (_("`%ps': not in executable format: %s"), styled_string (file_name_style.style (), bfd_get_filename (abfd.get ())), @@ -1683,7 +1683,7 @@ gdb_bfd_read_elf_soname (const char *filename) return {}; /* Check that ABFD is an ET_DYN ELF file. */ - if (!bfd_check_format (abfd.get (), bfd_object) + if (!gdb_bfd_check_format (abfd.get (), bfd_object) || !(bfd_get_file_flags (abfd.get ()) & DYNAMIC)) return {}; diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index 941292d3128..7d86fd88228 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -108,7 +108,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, name = "shared object read from target memory"; bfd_set_filename (nbfd, name); - if (!bfd_check_format (nbfd, bfd_object)) + if (!gdb_bfd_check_format (nbfd, bfd_object)) error (_("Got object file from memory but can't read symbols: %s."), bfd_errmsg (bfd_get_error ())); diff --git a/gdb/symfile.c b/gdb/symfile.c index 0413f7f7ce1..5f046a03567 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1706,7 +1706,7 @@ symfile_bfd_open (const char *name) styled_string (file_name_style.style (), name), bfd_errmsg (bfd_get_error ())); - if (!bfd_check_format (sym_bfd.get (), bfd_object)) + if (!gdb_bfd_check_format (sym_bfd.get (), bfd_object)) error (_("`%ps': can't read symbols: %s."), styled_string (file_name_style.style (), name), bfd_errmsg (bfd_get_error ())); @@ -2018,7 +2018,7 @@ generic_load (const char *args, int from_tty) if (loadfile_bfd == NULL) perror_with_name (filename.get ()); - if (!bfd_check_format (loadfile_bfd.get (), bfd_object)) + if (!gdb_bfd_check_format (loadfile_bfd.get (), bfd_object)) error (_("\"%ps\" is not an object file: %s"), styled_string (file_name_style.style (), filename.get ()), bfd_errmsg (bfd_get_error ())); @@ -2564,7 +2564,7 @@ reread_symbols (int from_tty) std::string original_name = objfile.original_name; /* bfd_openr sets cacheable to true, which is what we want. */ - if (!bfd_check_format (objfile.obfd.get (), bfd_object)) + if (!gdb_bfd_check_format (objfile.obfd.get (), bfd_object)) error (_("Can't read symbols from %ps: %s."), styled_string (file_name_style.style (), objfile_name (&objfile)), diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index a284438bd36..d9e924f16c6 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -699,7 +699,7 @@ windows_make_so (const char *name, LPVOID load_addr) if (abfd == NULL) return so; - if (bfd_check_format (abfd.get (), bfd_object)) + if (gdb_bfd_check_format (abfd.get (), bfd_object)) text = bfd_get_section_by_name (abfd.get (), ".text"); if (!text) -- 2.51.0