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

	* lexsup.c (enum option_values): Delete OPTION_MPC860C0.
	(ld_options): Delete mpc860c0 entry.
	(parse_args): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f8a9f89fd5bb02bec43e94719004937ee1db6958..b819d56476e07b6f8367ea54047ee9d78d0a2b46 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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

diff --git a/ld/ldmain.c b/ld/ldmain.c
index b18b580e83fd2d3d5511e0e1844e26f5ada9e0bc..51e8b8adaf490bf659958ef3149729281eeabe6d 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -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)

diff --git a/ld/lexsup.c b/ld/lexsup.c
index b8d0be4cba474d22821d13e6b5b6b000b60607ac..611f838e23133b2b9c1ee03de1f0c75436207c35 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -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;