espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 06:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reformat error messages to ease translation into other languages.

Browse Source
This commit is contained in:
Nick Clifton
2002-01-02 15:36:27 +00:00
parent 72c9928d4d
commit 5eefb65fea
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2002-01-02 Nick Clifton <nickc@cambridge.redhat.com>
* elf32-arm.h (elf32_arm_merge_private_bfd_data): Reformat error
messages to ease translation into other languages.
2001-12-31 Jakub Jelinek <jakub@redhat.com> 2001-12-31 Jakub Jelinek <jakub@redhat.com>
* elflink.h (elf_bfd_final_link): Check if dynobj is not NULL * elflink.h (elf_bfd_final_link): Check if dynobj is not NULL

34
bfd/elf32-arm.h
View File

@ -1,5 +1,5 @@
/* 32-bit ELF support for ARM /* 32-bit ELF support for ARM
Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
@ -2242,26 +2242,34 @@ Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT)) if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
{ {
char *s1 = in_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer"); if (in_flags & EF_ARM_APCS_FLOAT)
char *s2 = out_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer"); _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));
_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; flags_compatible = false;
} }
#ifdef EF_ARM_SOFT_FLOAT #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) != (out_flags & EF_ARM_SOFT_FLOAT))
{ {
char *s1 = in_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard"); if (in_flags & EF_ARM_SOFT_FLOAT)
char *s2 = out_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard"); _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));
_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; flags_compatible = false;
} }
#endif #endif