From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id AA6913846411 for ; Tue, 9 Feb 2021 07:32:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AA6913846411 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id CD46DACB7; Tue, 9 Feb 2021 07:32:41 +0000 (UTC) Date: Tue, 9 Feb 2021 08:32:40 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed] Allow .debug_macro section with version 5 Message-ID: <20210209073238.GA5483@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2021 07:32:43 -0000 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 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);