public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: Mark Harmstone <mark@harmstone.com>
To: binutils@sourceware.org
Cc: Mark Harmstone <mark@harmstone.com>
Subject: [PATCH 3/3] ld/testsuite: Don't add index to sizes in pdb.exp
Date: Mon, 26 Dec 2022 20:47:51 +0000	[thread overview]
Message-ID: <20221226204751.23761-3-mark@harmstone.com> (raw)
In-Reply-To: <20221226204751.23761-1-mark@harmstone.com>

---
 ld/testsuite/ld-pe/pdb.exp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ld/testsuite/ld-pe/pdb.exp b/ld/testsuite/ld-pe/pdb.exp
index b2016313e96..60aa39ae130 100644
--- a/ld/testsuite/ld-pe/pdb.exp
+++ b/ld/testsuite/ld-pe/pdb.exp
@@ -256,8 +256,8 @@ proc check_dbi_stream { pdb } {
     set data [read $fi 4]
     binary scan $data i type_server_map_size
 
-    set data [read $fi 4]
-    binary scan $data i mfc_type_server_index
+    # skip MFC type server index
+    seek $fi 4 current
 
     set data [read $fi 4]
     binary scan $data i optional_dbg_header_size
@@ -271,7 +271,7 @@ proc check_dbi_stream { pdb } {
 
     set stream_length [file size tmpdir/0003]
 
-    if { $stream_length != [expr 0x40 + $mod_info_size + $section_contribution_size + $section_map_size + $source_info_size + $type_server_map_size + $mfc_type_server_index + $optional_dbg_header_size + $ec_substream_size] } {
+    if { $stream_length != [expr 0x40 + $mod_info_size + $section_contribution_size + $section_map_size + $source_info_size + $type_server_map_size + $optional_dbg_header_size + $ec_substream_size] } {
 	return 0
     }
 
-- 
2.37.4


  parent reply	other threads:[~2022-12-26 20:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-26 20:47 [PATCH 1/3] ld: Handle extended-length data structures in PDB types Mark Harmstone
2022-12-26 20:47 ` [PATCH 2/3] ld: Handle LF_VFTABLE types in PDBs Mark Harmstone
2022-12-26 20:47 ` Mark Harmstone [this message]
2022-12-31  8:58 ` [PATCH 1/3] ld: Handle extended-length data structures in PDB types Alan Modra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221226204751.23761-3-mark@harmstone.com \
    --to=mark@harmstone.com \
    --cc=binutils@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).