X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fmri.c;h=e5c379c8b6091331688362d5430da8e5920d01bf;hb=39a7b38fac0e6e90baa3d661a271377db3ba1765;hp=fc7076af8ec02eb49a9265682febbd7b0cf9856a;hpb=eb8476a6e2fc115c0a953392e61ab27c7568a2a8;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/mri.c b/ld/mri.c
index fc7076af8e..e5c379c8b6 100644
--- a/ld/mri.c
+++ b/ld/mri.c
@@ -1,6 +1,5 @@
 /* mri.c -- handle MRI style linker scripts
-   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain <sac@cygnus.com>.
 
    This file is part of the GNU Binutils.
@@ -26,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"
@@ -45,6 +46,8 @@ struct section_name_struct {
 };
 
 static unsigned int symbol_truncate = 10000;
+static etree_type *base; /* Relocation base - or null */
+
 static struct section_name_struct *order;
 static struct section_name_struct *only_load;
 static struct section_name_struct *address;
@@ -208,7 +211,7 @@ mri_draw_tree (void)
 
 	  lang_enter_output_section_statement (p->name, base,
 					       p->ok_to_load ? normal_section : noload_section,
-					       align, subalign, NULL, 0);
+					       align, subalign, NULL, 0, 0);
 	  base = 0;
 	  tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
 	  tmp->next = NULL;
@@ -284,14 +287,8 @@ 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