This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
[PATCH] Further unification of ARM messages.
- From: Philipp Thomas <pthomas at suse dot de>
- To: binutils at sources dot redhat dot com
- Cc: Richard Earnshaw <Richard dot Earnshaw at arm dot com>
- Date: Thu, 31 Jan 2002 19:10:33 +0100
- Subject: [PATCH] Further unification of ARM messages.
After rechecking coff-arm.c and elf32-arm.h, I discovered yet more places
where messages could be unified. Here's the patch to accomplish that. It
also corrects punctuation and removes the gettext calls for APCS-26
and APCS-32 in elf32_arm_print_private_bfd_data as these should not be
translated.
OK to check in?
2002-01-31 Philipp Thomas <pthomas@suse.de>
* coff-arm.c (coff_arm_merge_private_bfd_data): Move ERROR
to front of message. Unify messages with elf32-arm.h. Use
commas where neccessary.
* elf32-arm.h (elf32_arm_merge_private_bfd_data): Use all upcase
ERROR in messages. Unify messages with coff-arm.c. Correct
VFP/FPA error message.
(elf32_arm_print_private_bfd_data): Don't mark APCS-26 and
APCS-32 for translation.
Index: coff-arm.c
===================================================================
RCS file: /cvs/src/src/bfd/coff-arm.c,v
retrieving revision 1.32
diff -u -p -r1.32 coff-arm.c
--- coff-arm.c 2002/01/30 14:51:38 1.32
+++ coff-arm.c 2002/01/31 14:42:09
@@ -2232,7 +2232,7 @@ coff_arm_merge_private_bfd_data (ibfd, o
{
_bfd_error_handler
/* xgettext: c-format */
- (_("%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d"),
+ (_("ERROR: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
bfd_archive_filename (ibfd), APCS_26_FLAG (ibfd) ? 26 : 32,
bfd_get_filename (obfd), APCS_26_FLAG (obfd) ? 26 : 32
);
@@ -2247,10 +2247,10 @@ coff_arm_merge_private_bfd_data (ibfd, o
if (APCS_FLOAT_FLAG (ibfd))
/* xgettext: c-format */
- msg = _("%s: ERROR: passes floats in float registers whereas target %s uses integer registers");
+ msg = _("ERROR: %s passes floats in float registers, whereas %s passes them in integer registers");
else
/* xgettext: c-format */
- msg = _("%s: ERROR: passes floats in integer registers whereas target %s uses float registers");
+ msg = _("ERROR: %s passes floats in integer registers, whereas %s passes them in float registers");
_bfd_error_handler (msg, bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
@@ -2265,10 +2265,10 @@ coff_arm_merge_private_bfd_data (ibfd, o
if (PIC_FLAG (ibfd))
/* xgettext: c-format */
- msg = _("%s: ERROR: compiled as position independent code, whereas target %s is absolute position");
+ msg = _("ERROR: %s compiled as position independent code, whereas target %s is absolute position");
else
/* xgettext: c-format */
- msg = _("%s: ERROR: compiled as absolute position code, whereas target %s is position independent");
+ msg = _("ERROR: %s compiled as absolute position code, whereas target %s is position independent");
_bfd_error_handler (msg, bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
Index: elf32-arm.h
===================================================================
RCS file: /cvs/src/src/bfd/elf32-arm.h,v
retrieving revision 1.72
diff -u -p -r1.72 elf32-arm.h
--- elf32-arm.h 2002/01/30 14:51:39 1.72
+++ elf32-arm.h 2002/01/31 14:42:09
@@ -2259,7 +2259,7 @@ elf32_arm_merge_private_bfd_data (ibfd,
if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
{
_bfd_error_handler (_("\
-Error: %s compiled for EABI version %d, whereas %s is compiled for version %d"),
+ERROR: %s compiled for EABI version %d, whereas %s is compiled for version %d"),
bfd_archive_filename (ibfd),
(in_flags & EF_ARM_EABIMASK) >> 24,
bfd_get_filename (obfd),
@@ -2273,7 +2273,7 @@ Error: %s compiled for EABI version %d,
if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
{
_bfd_error_handler (_("\
-Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
+ERROR: %s compiled for APCS-%d, whereas target %s uses APCS-%d"),
bfd_archive_filename (ibfd),
in_flags & EF_ARM_APCS_26 ? 26 : 32,
bfd_get_filename (obfd),
@@ -2285,12 +2285,12 @@ Error: %s compiled for APCS-%d, whereas
{
if (in_flags & EF_ARM_APCS_FLOAT)
_bfd_error_handler (_("\
-Error: %s passes floats in FP registers, whereas %s passes them in integer registers"),
+ERROR: %s passes floats in float 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"),
+ERROR: %s passes floats in integer registers, whereas %s passes them in float registers"),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
@@ -2301,12 +2301,12 @@ Error: %s passes floats in integer regis
{
if (in_flags & EF_ARM_VFP_FLOAT)
_bfd_error_handler (_("\
-Error: %s uses VFP instructions, whereas %s FPA instructions"),
+ERROR: %s uses VFP instructions, whereas %s uses FPA instructions"),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
else
_bfd_error_handler (_("\
-Error: %s uses FPA instructions, whereas %s VFP instructions"),
+ERROR: %s uses FPA instructions, whereas %s uses VFP instructions"),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
@@ -2326,12 +2326,12 @@ Error: %s uses FPA instructions, whereas
{
if (in_flags & EF_ARM_SOFT_FLOAT)
_bfd_error_handler (_ ("\
-Error: %s uses software FP, whereas %s uses hardware FP"),
+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"),
+ERROR: %s uses hardware FP, whereas %s uses software FP"),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
@@ -2346,14 +2346,14 @@ Error: %s uses hardware FP, whereas %s u
if (in_flags & EF_ARM_INTERWORK)
{
_bfd_error_handler (_("\
-Warning: %s supports interworking, whereas %s does not"),
+Warning: %s supports interworking, whereas %s does not."),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
}
else
{
_bfd_error_handler (_("\
-Warning: %s does not support interworking, whereas %s does"),
+Warning: %s does not support interworking, whereas %s does."),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
}
@@ -2395,9 +2395,9 @@ elf32_arm_print_private_bfd_data (abfd,
fprintf (file, _(" [interworking enabled]"));
if (flags & EF_ARM_APCS_26)
- fprintf (file, _(" [APCS-26]"));
+ fprintf (file, " [APCS-26]");
else
- fprintf (file, _(" [APCS-32]"));
+ fprintf (file, " [APCS-32]");
if (flags & EF_ARM_VFP_FLOAT)
fprintf (file, _(" [VFP float format]"));
--
Philipp Thomas <pthomas@suse.de>
Development, SuSE GmbH, Deutscherrnstr. 15-19, D-90429 Nuremberg, Germany
Penguins shall save the dinosaurs
-- Handelsblatt about Linux on S/390