diff --git a/ld/ldlang.c b/ld/ldlang.c index e1e491732a9..634a6843416 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -10823,8 +10823,6 @@ cmdline_emit_object_only_section (void) lang_init (true); ldexp_init (true); - ld_parse_linker_script (); - /* Set up the object-only output. */ lang_final (); diff --git a/ld/ldmain.c b/ld/ldmain.c index ffe1d70d15e..f1c5f7035c5 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -410,7 +410,34 @@ main (int argc, char **argv) ldemul_set_symbols (); - ld_parse_linker_script (); + /* If we have not already opened and parsed a linker script, + try the default script from command line first. */ + if (saved_script_handle == NULL + && command_line.default_script != NULL) + { + ldfile_open_script_file (command_line.default_script); + parser_input = input_script; + yyparse (); + } + + /* If we have not already opened and parsed a linker script + read the emulation's appropriate default script. */ + if (saved_script_handle == NULL) + { + int isfile; + char *s = ldemul_get_script (&isfile); + + if (isfile) + ldfile_open_default_command_file (s); + else + { + lex_string = s; + lex_redirect (s, _("built in linker script"), 1); + } + parser_input = input_script; + yyparse (); + lex_string = NULL; + } if (verbose) { @@ -1677,38 +1704,3 @@ notice (struct bfd_link_info *info, return true; } - -/* Parse the linker script. */ - -void -ld_parse_linker_script (void) -{ - /* If we have not already opened and parsed a linker script, - try the default script from command line first. */ - if (saved_script_handle == NULL - && command_line.default_script != NULL) - { - ldfile_open_script_file (command_line.default_script); - parser_input = input_script; - yyparse (); - } - - /* If we have not already opened and parsed a linker script - read the emulation's appropriate default script. */ - if (saved_script_handle == NULL) - { - int isfile; - char *s = ldemul_get_script (&isfile); - - if (isfile) - ldfile_open_default_command_file (s); - else - { - lex_string = s; - lex_redirect (s, _("built in linker script"), 1); - } - parser_input = input_script; - yyparse (); - lex_string = NULL; - } -} diff --git a/ld/ldmain.h b/ld/ldmain.h index 34770762f1c..0baa3c305c3 100644 --- a/ld/ldmain.h +++ b/ld/ldmain.h @@ -63,6 +63,4 @@ extern void add_ignoresym (struct bfd_link_info *, const char *); extern void add_keepsyms_file (const char *); extern void track_dependency_files (const char *); -extern void ld_parse_linker_script (void); - #endif