Help stupid cvs fixing basic conflicts.

1 files changed, 24 insertions, 24 deletions

diff --git a/gnu/usr.bin/binutils/ld/mpw-eppcmac.c b/gnu/usr.bin/binutils/ld/mpw-eppcmac.c
index 007d2658a30..ba09a410df2 100644
--- a/gnu/usr.bin/binutils/ld/mpw-eppcmac.c
+++ b/gnu/usr.bin/binutils/ld/mpw-eppcmac.c
@@ -1,7 +1,7 @@
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* AIX emulation code for ppcmacos
-   Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1995, 1998 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    AIX support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -229,7 +229,7 @@ gldppcmacos_parse_args (argc, argv)
     case 'D':
       val = strtol (optarg, &end, 0);
       if (*end != '\0')
-	einfo ("%P: warning: ignoring invalid -D number %s\n", optarg);
+	einfo (_("%P: warning: ignoring invalid -D number %s\n"), optarg);
       else if (val != -1)
 	lang_section_start (".data", exp_intop (val));
       break;
@@ -238,7 +238,7 @@ gldppcmacos_parse_args (argc, argv)
       val = strtoul (optarg, &end, 0);
       if (*end != '\0'
 	  || (val & (val - 1)) != 0)
-	einfo ("%P: warning: ignoring invalid -H number %s\n", optarg);
+	einfo (_("%P: warning: ignoring invalid -H number %s\n"), optarg);
       else
 	file_align = val;
       break;
@@ -304,7 +304,7 @@ gldppcmacos_parse_args (argc, argv)
     case OPTION_MAXDATA:
       val = strtoul (optarg, &end, 0);
       if (*end != '\0')
-	einfo ("%P: warning: ignoring invalid -bmaxdata number %s\n",
+	einfo (_("%P: warning: ignoring invalid -bmaxdata number %s\n"),
 	       optarg);
       else
 	maxdata = val;
@@ -313,7 +313,7 @@ gldppcmacos_parse_args (argc, argv)
     case OPTION_MAXSTACK:
       val = strtoul (optarg, &end, 0);
       if (*end != '\0')
-	einfo ("%P: warning: ignoring invalid -bmaxstack number %s\n",
+	einfo (_("%P: warning: ignoring invalid -bmaxstack number %s\n"),
 	       optarg);
       else
 	maxstack = val;
@@ -326,7 +326,7 @@ gldppcmacos_parse_args (argc, argv)
 	  ++optarg;
 	}
       if (*optarg == '\0' || optarg[1] == '\0')
-	einfo ("%P: warning: ignoring invalid module type %s\n", optarg);
+	einfo (_("%P: warning: ignoring invalid module type %s\n"), optarg);
       else
 	modtype = (*optarg << 8) | optarg[1];
       break;
@@ -346,7 +346,7 @@ gldppcmacos_parse_args (argc, argv)
          expression.  */
       val = strtoul (optarg, &end, 0);
       if (*end != '\0')
-	einfo ("%P: warning: ignoring invalid -pD number %s\n", optarg);
+	einfo (_("%P: warning: ignoring invalid -pD number %s\n"), optarg);
       else
 	{
 	  etree_type *t;
@@ -369,7 +369,7 @@ gldppcmacos_parse_args (argc, argv)
          within the file.  */
       val = strtoul (optarg, &end, 0);
       if (*end != '\0')
-	einfo ("%P: warning: ignoring invalid -pT number %s\n", optarg);
+	einfo (_("%P: warning: ignoring invalid -pT number %s\n"), optarg);
       else
 	{
 	  etree_type *t;
@@ -475,7 +475,7 @@ gldppcmacos_after_open ()
 
       size = (p->count + 2) * 4;
       if (! bfd_xcoff_link_record_set (output_bfd, &link_info, p->h, size))
-	einfo ("%F%P: bfd_xcoff_link_record_set failed: %E\n");
+	einfo (_("%F%P: bfd_xcoff_link_record_set failed: %E\n"));
     }
 }
 
@@ -500,9 +500,9 @@ gldppcmacos_before_allocation ()
 
       h = bfd_link_hash_lookup (link_info.hash, el->name, false, false, false);
       if (h == NULL)
-	einfo ("%P%F: bfd_link_hash_lookup of export symbol failed: %E\n");
+	einfo (_("%P%F: bfd_link_hash_lookup of export symbol failed: %E\n"));
       if (! bfd_xcoff_export_symbol (output_bfd, &link_info, h, el->syscall))
-	einfo ("%P%F: bfd_xcoff_export_symbol failed: %E\n");
+	einfo (_("%P%F: bfd_xcoff_export_symbol failed: %E\n"));
     }
 
   /* Track down all relocations called for by the linker script (these
@@ -547,7 +547,7 @@ gldppcmacos_before_allocation ()
 					 textro ? true : false,
 					 unix_ld,
 					 special_sections))
-    einfo ("%P%F: failed to set dynamic section sizes: %E\n");
+    einfo (_("%P%F: failed to set dynamic section sizes: %E\n"));
 
   /* Look through the special sections, and put them in the right
      place in the link ordering.  This is especially magic.  */
@@ -569,7 +569,7 @@ gldppcmacos_before_allocation ()
       is = NULL;
       os = lang_output_section_find (sec->output_section->name);
       if (os == NULL)
-	einfo ("%P%F: can't find output section %s\n",
+	einfo (_("%P%F: can't find output section %s\n"),
 	       sec->output_section->name);
       for (pls = &os->children.head; *pls != NULL; pls = &(*pls)->next)
 	{
@@ -602,7 +602,7 @@ gldppcmacos_before_allocation ()
 	}	
 
       if (is == NULL)
-	einfo ("%P%F: can't find %s in output section\n",
+	einfo (_("%P%F: can't find %s in output section\n"),
 	       bfd_get_section_name (sec->owner, sec));
 
       /* Now figure out where the section should go.  */
@@ -731,7 +731,7 @@ gldppcmacos_read_file (filename, import)
 	      obstack_free (o, obstack_base (o));
 	    }
 	  else if (*s == '(')
-	    einfo ("%F%s%d: #! ([member]) is not supported in import files",
+	    einfo (_("%F%s%d: #! ([member]) is not supported in import files\n"),
 		   filename, lineno);
 	  else
 	    {
@@ -771,7 +771,7 @@ gldppcmacos_read_file (filename, import)
 		{
 		  impmember = "";
 		  if (cs != '\0')
-		    einfo ("%s:%d: warning: syntax error in import file\n",
+		    einfo (_("%s:%d: warning: syntax error in import file\n"),
 			   filename, lineno);
 		}
 	      else
@@ -783,7 +783,7 @@ gldppcmacos_read_file (filename, import)
 		  if (*s == ')')
 		    *s = '\0';
 		  else
-		    einfo ("%s:%d: warning: syntax error in import file\n",
+		    einfo (_("%s:%d: warning: syntax error in import file\n"),
 			   filename, lineno);
 		}
 	    }
@@ -816,7 +816,7 @@ gldppcmacos_read_file (filename, import)
 	      while (isspace ((unsigned char) *se))
 		++se;
 	      if (*se != '\0')
-		einfo ("%s%d: warning: syntax error in import/export file\n",
+		einfo (_("%s%d: warning: syntax error in import/export file\n"),
 		       filename, lineno);
 	    }
 
@@ -829,7 +829,7 @@ gldppcmacos_read_file (filename, import)
 
 	      address = strtoul (s, &end, 0);
 	      if (*end != '\0')
-		einfo ("%s:%d: warning: syntax error in import/export file\n",
+		einfo (_("%s:%d: warning: syntax error in import/export file\n"),
 		       filename, lineno);
 	    }
 	}
@@ -860,7 +860,7 @@ gldppcmacos_read_file (filename, import)
 	      if (! bfd_xcoff_import_symbol (output_bfd, &link_info, h,
 					     address, imppath, impfile,
 					     impmember))
-		einfo ("%X%s:%d: failed to import symbol %s: %E\n",
+		einfo (_("%X%s:%d: failed to import symbol %s: %E\n"),
 		       filename, lineno, symname);
 	    }
 	}
@@ -870,7 +870,7 @@ gldppcmacos_read_file (filename, import)
 
   if (obstack_object_size (o) > 0)
     {
-      einfo ("%s:%d: warning: ignoring unterminated last line\n",
+      einfo (_("%s:%d: warning: ignoring unterminated last line\n"),
 	     filename, lineno);
       obstack_free (o, obstack_base (o));
     }
@@ -905,9 +905,9 @@ gldppcmacos_find_relocs (s)
 
       rs = &s->reloc_statement;
       if (rs->name == NULL)
-	einfo ("%F%P: only relocations against symbols are permitted\n");
+	einfo (_("%F%P: only relocations against symbols are permitted\n"));
       if (! bfd_xcoff_link_count_reloc (output_bfd, &link_info, rs->name))
-	einfo ("%F%P: bfd_xcoff_link_count_reloc failed: %E\n");
+	einfo (_("%F%P: bfd_xcoff_link_count_reloc failed: %E\n"));
     }
 
   if (s->header.type == lang_assignment_statement_enum)
@@ -935,7 +935,7 @@ gldppcmacos_find_exp_assignment (exp)
 	{
 	  if (! bfd_xcoff_record_link_assignment (output_bfd, &link_info,
 						  exp->assign.dst))
-	    einfo ("%P%F: failed to record assignment to %s: %E\n",
+	    einfo (_("%P%F: failed to record assignment to %s: %E\n"),
 		   exp->assign.dst);
 	}
       gldppcmacos_find_exp_assignment (exp->assign.src);