[committed][odr] Disable --odr by default

[committed][odr] Disable --odr by default

[Tom de Vries]

Hi,

With a few PRs open related to odr, it seems prudent to change the default to
disabled till we sort those out.

Committed to trunk.

Thanks,
- Tom

[odr] Disable --odr by default

2020-02-14  Tom de Vries  <tdevries@suse.de>

	* dwz.1: Update --odr/--no-odr default to disabled.
	* dwz.c (odr): Initalize to 0.
	(dwz_common_options_help): Update --odr/--no-odr default to disabled.

---
 dwz.1 | 2 +-
 dwz.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dwz.1 b/dwz.1
index b48bc02..709506c 100644
--- a/dwz.1
+++ b/dwz.1
@@ -94,7 +94,7 @@ This optimization causes struct/union/class DIEs with the same name to be
 considered equal.  This has the effect that DIEs referring to distinct DIEs
 representing the same type (like f.i. pointer type DIEs) are considered equal,
 and may be deduplicated.
-Enabled by default.
+Disabled by default.
 .TP
 .B \-\-odr-mode=<basic|link>
 Set the One-Definition-Rule optimization aggressiveness: basic or link.
diff --git a/dwz.c b/dwz.c
index 1c5170c..5748f6f 100644
--- a/dwz.c
+++ b/dwz.c
@@ -226,7 +226,7 @@ enum die_count_methods
 };
 static enum die_count_methods die_count_method = estimate;
 
-int odr = 1;
+int odr = 0;
 enum odr_mode { ODR_BASIC, ODR_LINK };
 enum odr_mode odr_mode = ODR_LINK;
 int odr_mode_parsed = 0;
@@ -14583,7 +14583,7 @@ static struct option_help dwz_common_options_help[] =
     "Don't optimize files larger than this limit." },
   { NULL, "odr", NULL, NULL,
     NULL },
-  { NULL, "no-odr", NULL, "Enabled",
+  { NULL, "no-odr", NULL, "Disabled",
     "Enable/disable one definition rule optimization." },
   { NULL, "odr-mode", "<basic|link>", "link",
     "Set aggressiveness level of one definition rule optimization." },