From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 59455 invoked by alias); 29 Nov 2019 15:22:30 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 59446 invoked by uid 89); 29 Nov 2019 15:22:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=*argv X-Spam-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed] Handle low-mem die-limit >= max die-limit Message-ID: <20191129152223.GA25723@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-SW-Source: 2019-q4/txt/msg00104.txt.bz2 Hi, Specifying a low-mem die-limit that is larger than or equal to the max die-limit has the effect of disabling low-mem mode. Make this explicit by setting it to the 'none' value. Committed to trunk. Thanks, - Tom Handle low-mem die-limit >= max die-limit 2019-11-29 Tom de Vries * dwz.c (main): Set low_mem_die_limit to none if >= max_die_limit. --- dwz.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dwz.c b/dwz.c index 3c886d6..e07f24b 100644 --- a/dwz.c +++ b/dwz.c @@ -13155,6 +13155,13 @@ main (int argc, char *argv[]) } } + /* Specifying a low-mem die-limit that is larger than or equal to the + max die-limit has the effect of disabling low-mem mode. Make this + explicit by setting it to the 'none' value. */ + if (low_mem_die_limit != -1U + && low_mem_die_limit >= max_die_limit) + low_mem_die_limit = -1U; + if (multifile_relative && multifile_name) error (1, 0, "-M and -r options can't be specified together");