From: Nick Clifton <nickc@redhat.com>
Date: Mon, 30 Jan 2006 13:06:53 +0000 (+0000)
Subject: * objcopy.c (copy_object): Catch the case where an attempt is made to add a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c8782eeec392f4d5166f6f69b5dcf01a3ac24c74;p=binutils-gdb.git

* 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.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 133cd20e857..f181bdf9ae5 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-30  Nick Clifton  <nickc@redhat.com>
+
+	* 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.
+
 2006-01-26  Nick Clifton  <nickc@redhat.com>
 
 	* po/vi.po: New Vietnamese translation.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 1d19fa8cebf..a9fb877ec08 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))
 	    {