* ldmain.c (main): Remove mpc860c0 code.

* lexsup.c (enum option_values): Delete OPTION_MPC860C0.
	(ld_options): Delete mpc860c0 entry.
	(parse_args): Likewise.
This commit is contained in:
Alan Modra 2003-12-02 05:58:11 +00:00
parent 37c8b24511
commit ffc18d8a82
3 changed files with 8 additions and 23 deletions

View File

@ -1,3 +1,10 @@
2003-12-02 Alan Modra <amodra@bigpond.net.au>
* ldmain.c (main): Remove mpc860c0 code.
* lexsup.c (enum option_values): Delete OPTION_MPC860C0.
(ld_options): Delete mpc860c0 entry.
(parse_args): Likewise.
2003-12-01 Alan Modra <amodra@bigpond.net.au>
* emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation): Test

View File

@ -316,7 +316,6 @@ main (int argc, char **argv)
and _fini symbols. We are compatible. */
link_info.init_function = "_init";
link_info.fini_function = "_fini";
link_info.mpc860c0 = 0;
link_info.pei386_auto_import = -1;
link_info.pei386_runtime_pseudo_reloc = FALSE;
link_info.spare_dynamic_tags = 5;
@ -345,8 +344,6 @@ main (int argc, char **argv)
{
if (command_line.gc_sections)
einfo ("%P%F: --gc-sections and -r may not be used together\n");
if (link_info.mpc860c0)
einfo (_("%P%F: -r and --mpc860c0 may not be used together\n"));
else if (command_line.relax)
einfo (_("%P%F: --relax and -r may not be used together\n"));
if (link_info.shared)

View File

@ -118,7 +118,6 @@ enum option_values
OPTION_NO_GC_SECTIONS,
OPTION_CHECK_SECTIONS,
OPTION_NO_CHECK_SECTIONS,
OPTION_MPC860C0,
OPTION_NO_UNDEFINED,
OPTION_INIT,
OPTION_FINI,
@ -440,9 +439,7 @@ static const struct ld_option ld_options[] =
{ {"whole-archive", no_argument, NULL, OPTION_WHOLE_ARCHIVE},
'\0', NULL, N_("Include all objects from following archives"), TWO_DASHES },
{ {"wrap", required_argument, NULL, OPTION_WRAP},
'\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES },
{ {"mpc860c0", optional_argument, NULL, OPTION_MPC860C0},
'\0', N_("[=WORDS]"), N_("Modify problematic branches in last WORDS (1-10,\n\t\t\t\tdefault 5) words of a page"), TWO_DASHES }
'\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }
};
#define OPTION_COUNT ARRAY_SIZE (ld_options)
@ -1245,22 +1242,6 @@ parse_args (unsigned argc, char **argv)
lang_leave_group ();
ingroup = 0;
break;
case OPTION_MPC860C0:
/* Default value (in bytes). */
link_info.mpc860c0 = 20;
if (optarg)
{
unsigned words;
words = is_num (optarg, 1, 10, 0);
if (words == 0)
einfo (_("%P%F: invalid argument to option \"mpc860c0\"\n"));
/* Convert words to bytes. */
link_info.mpc860c0 = words * 4;
}
command_line.relax = TRUE;
break;
case OPTION_INIT:
link_info.init_function = optarg;