diff options
| author | Sergio Durigan Junior <sergiodj@redhat.com> | 2017-12-01 16:58:47 -0500 |
|---|---|---|
| committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2017-12-01 16:58:47 -0500 |
| commit | 7f0f8ac8b15f5f5327116614b4137e5dd533ada2 (patch) | |
| tree | 3222e4411f845b46423966547889920b775f62e7 /gdb/main.c | |
| parent | 7ef67ba53397c52a87375403aa614c52b94ccc73 (diff) | |
Revert "Add support for the readnever concept"
This reverts commit e2e321740ce2e36a97be2a410cd56eebaa2304aa.
It was mistakenly pushed.
Diffstat (limited to 'gdb/main.c')
| -rw-r--r-- | gdb/main.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/gdb/main.c b/gdb/main.c index 8f04da107a..61168faf50 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -402,19 +402,6 @@ symbol_file_add_main_adapter (const char *arg, int from_tty) symbol_file_add_main (arg, add_flags); } -/* Perform validation of the '--readnow' and '--readnever' flags. */ - -static void -validate_readnow_readnever () -{ - if (readnever_symbol_files && readnow_symbol_files) - { - error (_("%s: '--readnow' and '--readnever' cannot be " - "specified simultaneously"), - gdb_program_name); - } -} - /* Type of this option. */ enum cmdarg_kind { @@ -592,17 +579,14 @@ captured_main_1 (struct captured_main_args *context) OPT_NOWINDOWS, OPT_WINDOWS, OPT_IX, - OPT_IEX, - OPT_READNOW, - OPT_READNEVER + OPT_IEX }; static struct option long_options[] = { {"tui", no_argument, 0, OPT_TUI}, {"dbx", no_argument, &dbx_commands, 1}, - {"readnow", no_argument, NULL, OPT_READNOW}, - {"readnever", no_argument, NULL, OPT_READNEVER}, - {"r", no_argument, NULL, OPT_READNOW}, + {"readnow", no_argument, &readnow_symbol_files, 1}, + {"r", no_argument, &readnow_symbol_files, 1}, {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, {"silent", no_argument, &quiet, 1}, @@ -825,20 +809,6 @@ captured_main_1 (struct captured_main_args *context) } break; - case OPT_READNOW: - { - readnow_symbol_files = 1; - validate_readnow_readnever (); - } - break; - - case OPT_READNEVER: - { - readnever_symbol_files = 1; - validate_readnow_readnever (); - } - break; - case '?': error (_("Use `%s --help' for a complete list of options."), gdb_program_name); @@ -1213,7 +1183,6 @@ Selection of debuggee and its files:\n\n\ --se=FILE Use FILE as symbol file and executable file.\n\ --symbols=SYMFILE Read symbols from SYMFILE.\n\ --readnow Fully read symbol files on first access.\n\ - --readnever Do not read symbol files.\n\ --write Set writing into executable and core files.\n\n\ "), stream); fputs_unfiltered (_("\ |