public inbox for dwz@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
To: dwz@sourceware.org, jakub@redhat.com
Subject: [committed] Allow .debug_macro section with version 5
Date: Tue, 9 Feb 2021 08:32:40 +0100	[thread overview]
Message-ID: <20210209073238.GA5483@delia> (raw)

Hi,

With this executable:
...
$ gcc -ggdb3 -gdwarf-5 hello.c
...
we run into:
...
$ cp a.out 1; cp 1 2; ./dwz-for-test -m 3 1 2
./dwz-for-test: 1: Unhandled .debug_macro version 5
./dwz-for-test: 2: Unhandled .debug_macro version 5
./dwz-for-test: No suitable DWARF found for multifile optimization
...

Fix this by allowing version 5 when reading .debug_macro.

Committed to trunk.

Thanks,
- Tom

Allow .debug_macro section with version 5

2021-02-09  Tom de Vries  <tdevries@suse.de>

	PR dwz/27368
	* dwz.c (read_macro): Allow version 5 .debug_macro.

---
 dwz.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dwz.c b/dwz.c
index 10860bf..1c4ffbf 100644
--- a/dwz.c
+++ b/dwz.c
@@ -9844,7 +9844,8 @@ read_macro (DSO *dso)
 	}
 
       version = read_16 (ptr);
-      if (version != 4)
+      bool supported_version_p = version >= 4 && version <= 5;
+      if (!supported_version_p)
 	{
 	  error (0, 0, "%s: Unhandled .debug_macro version %d", dso->filename,
 		 version);

                 reply	other threads:[~2021-02-09  7:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20210209073238.GA5483@delia \
    --to=tdevries@suse.de \
    --cc=dwz@sourceware.org \
    --cc=jakub@redhat.com \
    /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).