aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elf32-arm.c46
-rw-r--r--bfd/elf32-avr.c3
-rw-r--r--bfd/elf64-ppc.c2
4 files changed, 33 insertions, 25 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1b37860..09578f1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,12 @@
2017-04-13 Alan Modra <amodra@gmail.com>
+ * elf32-arm.c (arm_type_of_stub): Supply missing args to "long
+ branch veneers" error. Fix double space and format message.
+ * elf32-avr.c (avr_add_stub): Do not pass NULL as %B arg.
+ * elf64-ppc.c (tocsave_find): Supply missing %B arg.
+
+2017-04-13 Alan Modra <amodra@gmail.com>
+
* bfd-in2.h: Regenerate.
2017-04-11 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 0a78595..e04caef 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -4024,10 +4024,12 @@ arm_type_of_stub (struct bfd_link_info *info,
if (!thumb_only)
{
if (input_sec->flags & SEC_ELF_PURECODE)
- _bfd_error_handler (_("\
-%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE section \
-attribute is only supported for M-profile targets that implement the movw instruction."),
- input_sec);
+ _bfd_error_handler
+ (_("%B(%A): warning: long branch veneers used in"
+ " section with SHF_ARM_PURECODE section"
+ " attribute is only supported for M-profile"
+ " targets that implement the movw instruction."),
+ input_bfd, input_sec);
stub_type = (bfd_link_pic (info) | globals->pic_veneer)
/* PIC stubs. */
@@ -4056,10 +4058,12 @@ attribute is only supported for M-profile targets that implement the movw instru
else
{
if (input_sec->flags & SEC_ELF_PURECODE)
- _bfd_error_handler (_("\
-%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE section \
-attribute is only supported for M-profile targets that implement the movw instruction."),
- input_sec);
+ _bfd_error_handler
+ (_("%B(%A): warning: long branch veneers used in"
+ " section with SHF_ARM_PURECODE section"
+ " attribute is only supported for M-profile"
+ " targets that implement the movw instruction."),
+ input_bfd, input_sec);
stub_type = (bfd_link_pic (info) | globals->pic_veneer)
/* PIC stub. */
@@ -4073,13 +4077,12 @@ attribute is only supported for M-profile targets that implement the movw instru
else
{
if (input_sec->flags & SEC_ELF_PURECODE)
- _bfd_error_handler (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler
+ (_("%B(%A): warning: long branch veneers used in"
+ " section with SHF_ARM_PURECODE section"
+ " attribute is only supported" " for M-profile"
+ " targets that implement the movw instruction."),
+ input_bfd, input_sec);
/* Thumb to arm. */
if (sym_sec != NULL
@@ -4126,13 +4129,12 @@ attribute is only supported for M-profile targets that implement the movw instru
|| r_type == R_ARM_TLS_CALL)
{
if (input_sec->flags & SEC_ELF_PURECODE)
- _bfd_error_handler (_("%B(%s): warning: long branch "
- " veneers used in section with "
- "SHF_ARM_PURECODE section "
- "attribute is only supported"
- " for M-profile targets that "
- "implement the movw "
- "instruction."));
+ _bfd_error_handler
+ (_("%B(%A): warning: long branch veneers used in"
+ " section with SHF_ARM_PURECODE section"
+ " attribute is only supported for M-profile"
+ " targets that implement the movw instruction."),
+ input_bfd, input_sec);
if (branch_type == ST_BRANCH_TO_THUMB)
{
/* Arm to thumb. */
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 56b143d..0f6c188 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -3284,8 +3284,7 @@ avr_add_stub (const char *stub_name,
if (hsh == NULL)
{
/* xgettext:c-format */
- _bfd_error_handler (_("%B: cannot create stub entry %s"),
- NULL, stub_name);
+ _bfd_error_handler (_("cannot create stub entry %s"), stub_name);
return NULL;
}
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 386db9a..e48d67d 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -7651,7 +7651,7 @@ tocsave_find (struct ppc_link_hash_table *htab,
if (ent.sec == NULL || ent.sec->output_section == NULL)
{
_bfd_error_handler
- (_("%B: undefined symbol on R_PPC64_TOCSAVE relocation"));
+ (_("%B: undefined symbol on R_PPC64_TOCSAVE relocation"), ibfd);
return NULL;
}