Help stupid cvs fixing basic conflicts.

1 files changed, 56 insertions, 8 deletions

diff --git a/gnu/usr.bin/binutils/ld/ldemul.c b/gnu/usr.bin/binutils/ld/ldemul.c
index d0243b29cc7..08a4e47e1cf 100644
--- a/gnu/usr.bin/binutils/ld/ldemul.c
+++ b/gnu/usr.bin/binutils/ld/ldemul.c
@@ -1,5 +1,6 @@
 /* ldemul.c -- clearing house for ld emulation states
-   Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999
+   Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -156,6 +157,17 @@ ldemul_unrecognized_file (entry)
   return false;
 }
 
+/* Let the emulation code handle a recognized file.  */
+
+boolean
+ldemul_recognized_file (entry)
+     lang_input_statement_type *entry;
+{
+  if (ld_emulation->recognized_file)
+    return (*ld_emulation->recognized_file) (entry);
+  return false;
+}
+
 char *
 ldemul_choose_target()
 {
@@ -167,7 +179,7 @@ ldemul_choose_target()
 char *
 ldemul_default_target()
 {
-  char *from_outside = (char *) getenv(TARGET_ENVIRON);
+  char *from_outside = getenv (TARGET_ENVIRON);
   if (from_outside != (char *)NULL)
     return from_outside;
   return ld_emulation->target_name;
@@ -207,17 +219,17 @@ set_output_arch_default()
 /*ARGSUSED*/
 void
 syslib_default(ignore)
-     char  *ignore;
+     char  *ignore ATTRIBUTE_UNUSED;
 {
-  info_msg ("%S SYSLIB ignored\n");
+  info_msg (_("%S SYSLIB ignored\n"));
 }
 
 /*ARGSUSED*/
 void
 hll_default(ignore)
-     char  *ignore;
+     char  *ignore ATTRIBUTE_UNUSED;
 {
-  info_msg ("%S HLL ignored\n");
+  info_msg (_("%S HLL ignored\n"));
 }
 
 ld_emulation_xfer_type *ld_emulations[] = { EMULATION_LIST };
@@ -238,8 +250,8 @@ ldemul_choose_mode(target)
 	    return;
 	  }
       }
-    einfo ("%P: unrecognised emulation mode: %s\n", target);
-    einfo ("Supported emulations: ", program_name);
+    einfo (_("%P: unrecognised emulation mode: %s\n"), target);
+    einfo (_("Supported emulations: "));
     ldemul_list_emulations (stderr);
     einfo ("%F\n");
 }
@@ -260,3 +272,39 @@ ldemul_list_emulations (f)
       fprintf (f, "%s", (*eptr)->emulation_name);
     }
 }
+
+void
+ldemul_list_emulation_options (f)
+     FILE * f;
+{
+  ld_emulation_xfer_type ** eptr;
+  int options_found = 0;
+  
+  for (eptr = ld_emulations; * eptr; eptr ++)
+    {
+      ld_emulation_xfer_type * emul = * eptr;
+      
+      if (emul->list_options)
+	{
+	  fprintf (f, "%s: \n", emul->emulation_name);
+      
+	  emul->list_options (f);
+
+	  options_found = 1;
+	}
+    }
+  
+  if (! options_found)
+    fprintf (f, _("  no emulation specific options.\n"));
+}
+
+int
+ldemul_find_potential_libraries (name, entry)
+     char * name;
+     lang_input_statement_type * entry;
+{
+  if (ld_emulation->find_potential_libraries)
+    return ld_emulation->find_potential_libraries (name, entry);
+
+  return 0;
+}