* som.c (struct fixup_format): Constify `format'.

[deliverable/binutils-gdb.git] / ld / mpw-elfmips.c

diff --git a/ld/mpw-elfmips.c b/ld/mpw-elfmips.c
index cbf1589875439e9ae8c7763b6b3e7f2530361575..3143b2ec1482a0645a335a4d2234bb6ceda7d235 100644 (file)
--- a/ld/mpw-elfmips.c
+++ b/ld/mpw-elfmips.c
@@ -1,7 +1,8 @@
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* 32 bit ELF emulation code for elf32ebmip
-   Copyright (C) 1991, 93, 94, 95, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1991, 93, 94, 95, 96, 98, 2000
+   Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    ELF support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -32,12 +33,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "ld.h"
 #include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
 #include "ldmisc.h"
 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldgram.h"
+#include "ldfile.h"
+#include "ldemul.h"
 
 static void gldelf32ebmip_before_parse PARAMS ((void));
 static boolean gldelf32ebmip_open_dynamic_archive
@@ -442,12 +443,11 @@ gldelf32ebmip_before_allocation ()
   rpath = command_line.rpath;
   if (rpath == NULL)
     rpath = (const char *) getenv ("LD_RUN_PATH");
-  if (! bfd_elf32_size_dynamic_sections (output_bfd,
-                                                command_line.soname,
-                                                rpath,
-                                                command_line.export_dynamic,
-                                                &link_info,
-                                                &sinterp))
+  if (! (bfd_elf32_size_dynamic_sections
+        (output_bfd, command_line.soname, rpath,
+         command_line.export_dynamic, command_line.filter_shlib,
+         (const char * const *) command_line.auxiliary_filters,
+         &link_info, &sinterp, lang_elf_version_info)))
     einfo (_("%P%F: failed to set dynamic section sizes: %E\n"));
 
   /* Let the user override the dynamic linker we are using.  */
@@ -496,37 +496,6 @@ gldelf32ebmip_before_allocation ()
        s->_raw_size = 0;
       }
   }
-
-#if defined (TARGET_IS_elf32bmip) || defined (TARGET_IS_elf32lmip)
-  /* For MIPS ELF the .reginfo section requires special handling.
-     Each input section is 24 bytes, and the final output section must
-     also be 24 bytes.  We handle this by clobbering all but the first
-     input section size to 0.  The .reginfo section is handled
-     specially by the backend code anyhow.  */
-  {
-    boolean found = false;
-    LANG_FOR_EACH_INPUT_STATEMENT (is)
-      {
-       asection *s;
-
-       if (is->just_syms_flag)
-         continue;
-
-       s = bfd_get_section_by_name (is->the_bfd, ".reginfo");
-       if (s == NULL)
-         continue;
-
-       if (! found)
-         {
-           found = true;
-           continue;
-         }
-
-       s->_raw_size = 0;
-       s->_cooked_size = 0;
-      }
-  }
-#endif
 }
 
 /* This is called by the before_allocation routine via
@@ -725,7 +694,9 @@ gldelf32ebmip_place_orphan (file, s)
   os = lang_output_section_statement_lookup (secname);
   wild_doit (&os->children, s, os, file);
 
-  lang_leave_output_section_statement ((bfd_vma) 0, "*default*");
+  lang_leave_output_section_statement
+    ((bfd_vma) 0, "*default*",
+     (struct lang_output_section_phdr_list *) NULL, "*default*");
   stat_ptr = &add;
 
   if (*ps == '\0' && config.build_constructors)