aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-01-02 15:36:27 +0000
committerNick Clifton <nickc@redhat.com>2002-01-02 15:36:27 +0000
commit5eefb65fea305337aa7325acc53b5a00d0aa9800 (patch)
treeca33af5d03569ce1bd0c1858ec6fe60762931987 /bfd
parent72c9928d4dc8bbd97d31ed6dcfedd2e830a86c94 (diff)
downloadgdb-5eefb65fea305337aa7325acc53b5a00d0aa9800.zip
gdb-5eefb65fea305337aa7325acc53b5a00d0aa9800.tar.gz
gdb-5eefb65fea305337aa7325acc53b5a00d0aa9800.tar.bz2
Reformat error messages to ease translation into other languages.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h34
2 files changed, 26 insertions, 13 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9b54028..8fc76cd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
* elflink.h (elf_bfd_final_link): Check if dynobj is not NULL
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index d5cfcd4..afe3c8f 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1,5 +1,5 @@
/* 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.
@@ -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))
{
- char *s1 = in_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
- char *s2 = out_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
+ 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));
- _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");
+ 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));
- _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