From: Douglas Raillard <douglas.raillard@xxxxxxx> This reverts commit 6bf42c504b25f7daf9b601655ba1f8ba9ae3dd79. Signed-off-by: Douglas Raillard <douglas.raillard@xxxxxxx> --- man-pages/pahole.1 | 7 ------- pahole.c | 8 -------- 2 files changed, 15 deletions(-) diff --git a/man-pages/pahole.1 b/man-pages/pahole.1 index 583e8a9..c1ec63e 100644 --- a/man-pages/pahole.1 +++ b/man-pages/pahole.1 @@ -122,13 +122,6 @@ Skip COUNT input records. Expand class members. Useful to find in what member of inner structs where an offset from the beginning of a struct is. -.TP -.B \-\-inner_anonymous -Allow making inner structs, enums and unions anonymous, so that when using -E -to expand types we don't end up with multiple definitions for the expanded -inner structs/enums/unions, allowing the resulting expanded struct to be -compilable. - .TP .B \-F, \-\-format_path Allows specifying a list of debugging formats to try, in order. Right now this diff --git a/pahole.c b/pahole.c index 0f4ca57..f3a51cb 100644 --- a/pahole.c +++ b/pahole.c @@ -1127,7 +1127,6 @@ ARGP_PROGRAM_VERSION_HOOK_DEF = dwarves_print_version; #define ARGP_skip_encoding_btf_decl_tag 331 #define ARGP_skip_missing 332 #define ARGP_skip_encoding_btf_type_tag 333 -#define ARGP_inner_anonymous 334 static const struct argp_option pahole__options[] = { { @@ -1235,11 +1234,6 @@ static const struct argp_option pahole__options[] = { .key = 'E', .doc = "expand class members", }, - { - .name = "inner_anonymous", - .key = ARGP_inner_anonymous, - .doc = "expanded class members are anonymous", - }, { .name = "nr_members", .key = 'n', @@ -1672,8 +1666,6 @@ static error_t pahole__options_parser(int key, char *arg, conf_load.skip_missing = true; break; case ARGP_skip_encoding_btf_type_tag: conf_load.skip_encoding_btf_type_tag = true; break; - case ARGP_inner_anonymous: - conf.inner_anonymous = true; break; default: return ARGP_ERR_UNKNOWN; } -- 2.25.1