[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[committed] Handle low-mem die-limit >= max die-limit



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  <tdevries@suse.de>

	* 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");