2005-02-06 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / ld / mri.c

diff --git a/ld/mri.c b/ld/mri.c
index f7edd8817ffe713af0b74089d77a7f9666473008..9ed4ca50e00e7ad3f5a600a8ebc3a79c216e691d 100644 (file)
--- a/ld/mri.c
+++ b/ld/mri.c
@@ -120,19 +120,6 @@ mri_draw_tree (void)
   if (done_tree)
     return;
 
-#if 0   /* We don't bother with memory regions.  */
-  /* Create the regions.  */
-  {
-    lang_memory_region_type *r;
-
-    r = lang_memory_region_lookup("long");
-    r->current = r->origin = exp_get_vma (base, (bfd_vma)0, "origin",
-                                         lang_first_phase_enum);
-    r->length = (bfd_size_type) exp_get_vma (0, ~(bfd_vma) 0, "length",
-                                            lang_first_phase_enum);
-  }
-#endif
-
   /* Now build the statements for the ldlang machine.  */
 
   /* Attach the addresses of any which have addresses,
@@ -220,13 +207,13 @@ mri_draw_tree (void)
 
          lang_enter_output_section_statement (p->name, base,
                                               p->ok_to_load ? 0 : noload_section,
-                                              align, subalign, NULL);
+                                              align, subalign, NULL, 0);
          base = 0;
          tmp = xmalloc (sizeof *tmp);
          tmp->next = NULL;
          tmp->spec.name = p->name;
          tmp->spec.exclude_name_list = NULL;
-         tmp->spec.sorted = FALSE;
+         tmp->spec.sorted = none;
          lang_add_wild (NULL, tmp, FALSE);
 
          /* If there is an alias for this section, add it too.  */
@@ -237,7 +224,7 @@ mri_draw_tree (void)
                tmp->next = NULL;
                tmp->spec.name = aptr->name;
                tmp->spec.exclude_name_list = NULL;
-               tmp->spec.sorted = FALSE;
+               tmp->spec.sorted = none;
                lang_add_wild (NULL, tmp, FALSE);
              }
 
@@ -255,9 +242,6 @@ mri_load (const char *name)
 {
   base = 0;
   lang_add_input_file (name, lang_input_file_is_file_enum, NULL);
-#if 0
-  lang_leave_output_section_statement (0, "*default*");
-#endif
 }
 
 void