From 6c571f008369d830772b1edd2a55d978580c4163 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Fri, 1 Feb 2002 13:26:56 +0000 Subject: [PATCH] 2002-01-31 Philipp Thomas * 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. --- bfd/ChangeLog | 11 +++++++++++ bfd/coff-arm.c | 14 +++++++------- bfd/elf32-arm.h | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index bbcc9e708cc..492fd6c59ed 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2002-01-31 Philipp Thomas + + * 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. + 2002-02-01 Hans-Peter Nilsson Perform on-demand global register allocation from diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index 0498dc5cdbb..ca08131d1cb 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -2232,7 +2232,7 @@ coff_arm_merge_private_bfd_data (ibfd, obfd) { _bfd_error_handler /* xgettext: c-format */ - (_("%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d"), + (_("ERROR: %s is 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, obfd) 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, obfd) if (PIC_FLAG (ibfd)) /* xgettext: c-format */ - msg = _("%s: ERROR: compiled as position independent code, whereas target %s is absolute position"); + msg = _("ERROR: %s is 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 is compiled as absolute position code, whereas target %s is position independent"); _bfd_error_handler (msg, bfd_archive_filename (ibfd), bfd_get_filename (obfd)); @@ -2297,10 +2297,10 @@ coff_arm_merge_private_bfd_data (ibfd, obfd) if (INTERWORK_FLAG (ibfd)) /* xgettext: c-format */ - msg = _("Warning: %s supports interworking, whereas %s does not."); + msg = _("Warning: %s supports interworking, whereas %s does not"); else /* xgettext: c-format */ - msg = _("Warning: %s does not support interworking, whereas %s does."); + msg = _("Warning: %s does not support interworking, whereas %s does"); _bfd_error_handler (msg, bfd_archive_filename (ibfd), bfd_get_filename (obfd)); diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 794db31ccba..da6a5a765e1 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -2259,7 +2259,7 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd) 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 is 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, whereas %s is compiled for 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 is 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 %s is compiled for APCS-%d"), { 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 registers, whereas %s passes them in FP regis { if (in_flags & EF_ARM_VFP_FLOAT) _bfd_error_handler (_("\ -Error: %s uses VFP instructions, whereas %s uses 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 uses 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 %s uses VFP instructions"), { 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)); @@ -2395,9 +2395,9 @@ elf32_arm_print_private_bfd_data (abfd, ptr) 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]")); -- 2.30.2