elf: Adjust PR ld/30791 tests

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

diff --git a/ld/mri.c b/ld/mri.c
index a2ffcaa33e35704dc92f4841305287958628ba50..5ba51ef93d737cf642533d4a0442d2254eda0e3d 100644 (file)
--- a/ld/mri.c
+++ b/ld/mri.c
@@ -1,5 +1,5 @@
 /* mri.c -- handle MRI style linker scripts
-   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991-2023 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain <sac@cygnus.com>.
 
    This file is part of the GNU Binutils.
@@ -25,6 +25,8 @@
 
 #include "sysdep.h"
 #include "bfd.h"
+#include "bfdlink.h"
+#include "ctf-api.h"
 #include "ld.h"
 #include "ldexp.h"
 #include "ldlang.h"
@@ -208,8 +210,8 @@ mri_draw_tree (void)
            base = p->vma ? p->vma : exp_nameop (NAME, ".");
 
          lang_enter_output_section_statement (p->name, base,
-                                              p->ok_to_load ? normal_section : noload_section,
-                                              align, subalign, NULL, 0, 0);
+           p->ok_to_load ? normal_section : noload_section, 0,
+           align, subalign, NULL, 0, 0);
          base = 0;
          tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
          tmp->next = NULL;
@@ -217,7 +219,7 @@ mri_draw_tree (void)
          tmp->spec.exclude_name_list = NULL;
          tmp->spec.sorted = none;
          tmp->spec.section_flag_list = NULL;
-         lang_add_wild (NULL, tmp, FALSE);
+         lang_add_wild (NULL, tmp, false);
 
          /* If there is an alias for this section, add it too.  */
          for (aptr = alias; aptr; aptr = aptr->next)
@@ -229,7 +231,7 @@ mri_draw_tree (void)
                tmp->spec.exclude_name_list = NULL;
                tmp->spec.sorted = none;
                tmp->spec.section_flag_list = NULL;
-               lang_add_wild (NULL, tmp, FALSE);
+               lang_add_wild (NULL, tmp, false);
              }
 
          lang_leave_output_section_statement (0, "*default*", NULL, NULL);
@@ -285,20 +287,14 @@ mri_format (const char *name)
   if (strcmp (name, "S") == 0)
     lang_add_output_format ("srec", NULL, NULL, 1);
 
-  else if (strcmp (name, "IEEE") == 0)
-    lang_add_output_format ("ieee", NULL, NULL, 1);
-
-  else if (strcmp (name, "COFF") == 0)
-    lang_add_output_format ("coff-m68k", NULL, NULL, 1);
-
   else
-    einfo (_("%P%F: unknown format type %s\n"), name);
+    einfo (_("%F%P: unknown format type %s\n"), name);
 }
 
 void
 mri_public (const char *name, etree_type *exp)
 {
-  lang_add_assignment (exp_assign (name, exp, FALSE));
+  lang_add_assignment (exp_assign (name, exp, false));
 }
 
 void