Re: Assorted i18n bugs with bfd

[Nick Clifton]

Hi Christian,

> While translating bfd 2.11 into Swedish, I have encountered some
> messages from the source that are problematic with regard to
> internationalization.

> BUG 1
> -----
> elf32-arm.h:2138
> 
> BUG 2
> -----
> elf32-arm.h:2150

I have applied the patch below to fix these two.

> BUG 3
> -----
> elf32-arm.h:2162

This case has already been handled.  The fix is in the current
development sources and will appear in the next official binutils
release.

Cheers
        Nick

Index: bfd/elf32-arm.h
===================================================================
RCS file: /cvs/src/src/bfd/elf32-arm.h,v
retrieving revision 1.67
diff -p -c -r1.67 elf32-arm.h
*** elf32-arm.h 2001/12/17 00:52:35     1.67
--- elf32-arm.h 2002/01/02 15:34:28
***************
*** 1,5 ****
  /* 32-bit ELF support for ARM
!    Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  
     This file is part of BFD, the Binary File Descriptor library.
  
--- 1,5 ----
  /* 32-bit ELF support for ARM
!    Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
  
     This file is part of BFD, the Binary File Descriptor library.
  
*************** Error: %s compiled for APCS-%d, whereas 
*** 2242,2267 ****
  
        if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
        {
!         char *s1 = in_flags  & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
!         char *s2 = out_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
  
-         _bfd_error_handler (_("\
- Error: %s passes floats in %s registers, whereas %s passes them in %s 
registers"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
          flags_compatible = false;
        }
  
  #ifdef EF_ARM_SOFT_FLOAT
        if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
        {
!         char *s1 = in_flags  & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
!         char *s2 = out_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
  
-         _bfd_error_handler (_ ("\
- Error: %s uses %s floating point, whereas %s uses %s floating point"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
          flags_compatible = false;
        }
  #endif
--- 2242,2275 ----
  
        if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
        {
!         if (in_flags & EF_ARM_APCS_FLOAT)
!           _bfd_error_handler (_("\
! Error: %s passes floats in FP registers, whereas %s passes them in integer 
registers"),
!                               bfd_archive_filename (ibfd),
!                               bfd_get_filename (obfd));
!         else
!           _bfd_error_handler (_("\
! Error: %s passes floats in integer registers, whereas %s passes them in FP 
registers"),
!                               bfd_archive_filename (ibfd),
!                               bfd_get_filename (obfd));
  
          flags_compatible = false;
        }
  
  #ifdef EF_ARM_SOFT_FLOAT
        if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
        {
!         if (in_flags & EF_ARM_SOFT_FLOAT)
!           _bfd_error_handler (_ ("\
! Error: %s uses software FP, whereas %s uses hardware FP"),
!                               bfd_archive_filename (ibfd),
!                               bfd_get_filename (obfd));
!         else
!           _bfd_error_handler (_ ("\
! Error: %s uses hardware FP, whereas %s uses software FP"),
!                               bfd_archive_filename (ibfd),
!                               bfd_get_filename (obfd));
  
          flags_compatible = false;
        }
  #endif