2021-02-26 15:20:13 +01:00
|
|
|
Enable odr by default
|
|
|
|
|
|
|
|
This reverts commit d49096d "[odr] Disable --odr by default".
|
|
|
|
|
|
|
|
---
|
|
|
|
dwz.1 | 2 +-
|
|
|
|
dwz.c | 4 ++--
|
|
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/dwz.1 b/dwz.1
|
2021-03-18 08:54:52 +01:00
|
|
|
index 19dc814..63c50d5 100644
|
2021-02-26 15:20:13 +01:00
|
|
|
--- a/dwz.1
|
|
|
|
+++ b/dwz.1
|
2021-03-18 08:54:52 +01:00
|
|
|
@@ -119,7 +119,7 @@ considered equal. This has the effect that DIEs referring to distinct DIEs
|
2021-02-26 15:20:13 +01:00
|
|
|
representing the same type (like f.i. pointer type DIEs) are considered equal,
|
2021-03-18 08:54:52 +01:00
|
|
|
and may be deduplicated. The status of this optimization is experimental.
|
|
|
|
It's disabled in low-mem mode.
|
2021-02-26 15:20:13 +01:00
|
|
|
-Disabled by default.
|
|
|
|
+Enabled 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
|
2021-03-18 08:54:52 +01:00
|
|
|
index 5effbc1..a02b8fd 100644
|
2021-02-26 15:20:13 +01:00
|
|
|
--- a/dwz.c
|
|
|
|
+++ b/dwz.c
|
|
|
|
@@ -230,7 +230,7 @@ enum die_count_methods
|
|
|
|
};
|
|
|
|
static enum die_count_methods die_count_method = estimate;
|
|
|
|
|
|
|
|
-int odr = 0;
|
|
|
|
+int odr = 1;
|
|
|
|
enum odr_mode { ODR_BASIC, ODR_LINK };
|
|
|
|
enum odr_mode odr_mode = ODR_LINK;
|
|
|
|
int odr_mode_parsed = 0;
|
2021-03-18 08:54:52 +01:00
|
|
|
@@ -16343,7 +16343,7 @@ static struct option_help dwz_common_options_help[] =
|
2021-02-26 15:20:13 +01:00
|
|
|
"Don't optimize files larger than this limit." },
|
|
|
|
{ NULL, "odr", NULL, NULL,
|
|
|
|
NULL },
|
|
|
|
- { NULL, "no-odr", NULL, "Disabled",
|
|
|
|
+ { NULL, "no-odr", NULL, "Enabled",
|
|
|
|
"Enable/disable one definition rule optimization." },
|
|
|
|
{ NULL, "odr-mode", "<basic|link>", "link",
|
|
|
|
"Set aggressiveness level of one definition rule optimization." },
|