aboutsummaryrefslogtreecommitdiff
path: root/binutils/objcopy.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2006-01-30 13:06:53 +0000
committerNick Clifton <nickc@redhat.com>2006-01-30 13:06:53 +0000
commitc8782eeec392f4d5166f6f69b5dcf01a3ac24c74 (patch)
tree4f00d77bc377e6e2ec32bcfd05d01df0e32a9d9d /binutils/objcopy.c
parent790433a9e137297eda7547b5a62e268731afbe8d (diff)
downloadfsf-binutils-gdb-c8782eeec392f4d5166f6f69b5dcf01a3ac24c74.zip
fsf-binutils-gdb-c8782eeec392f4d5166f6f69b5dcf01a3ac24c74.tar.gz
fsf-binutils-gdb-c8782eeec392f4d5166f6f69b5dcf01a3ac24c74.tar.bz2
* objcopy.c (copy_object): Catch the case where an attempt is made to add a
section that already exists and produce a more helpful warning message.
Diffstat (limited to 'binutils/objcopy.c')
-rw-r--r--binutils/objcopy.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 1d19fa8..a9fb877 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1313,13 +1313,23 @@ copy_object (bfd *ibfd, bfd *obfd)
if (pset != NULL && pset->set_flags)
flags = pset->flags | SEC_HAS_CONTENTS;
- padd->section = bfd_make_section_with_flags (obfd, padd->name, flags);
- if (padd->section == NULL)
+ /* bfd_make_section_with_flags() does not return very helpful
+ error codes, so check for the most likely user error first. */
+ if (bfd_get_section_by_name (obfd, padd->name))
{
- non_fatal (_("can't create section `%s': %s"),
- padd->name, bfd_errmsg (bfd_get_error ()));
+ non_fatal (_("can't add section '%s' - it already exists!"), padd->name);
return FALSE;
}
+ else
+ {
+ padd->section = bfd_make_section_with_flags (obfd, padd->name, flags);
+ if (padd->section == NULL)
+ {
+ non_fatal (_("can't create section `%s': %s"),
+ padd->name, bfd_errmsg (bfd_get_error ()));
+ return FALSE;
+ }
+ }
if (! bfd_set_section_size (obfd, padd->section, padd->size))
{