* embedspu.sh: Handle R_SPU_PPU* relocs with no symbol.

[deliverable/binutils-gdb.git] / binutils / objcopy.c

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index a841e014d40ceb4ee8e89e1cb25eb4b3dcd299c2..3cfb831af40cef704915a48394af7d5afc07cdb4 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1423,12 +1423,7 @@ copy_object (bfd *ibfd, bfd *obfd)
      any output is done.  Thus, we traverse all sections multiple times.  */
   bfd_map_over_sections (ibfd, setup_section, obfd);
 
-  /* Don't copy headers when creating an ELF format debug info file.  */
-  if (bfd_get_flavour (ibfd) == bfd_target_elf_flavour
-      && strip_symbols == STRIP_NONDEBUG)
-    ;
-  else
-    setup_bfd_headers (ibfd, obfd);
+  setup_bfd_headers (ibfd, obfd);
 
   if (add_sections != NULL)
     {
@@ -1771,12 +1766,7 @@ copy_object (bfd *ibfd, bfd *obfd)
      from the input BFD to the output BFD.  This is done last to
      permit the routine to look at the filtered symbol table, which is
      important for the ECOFF code at least.  */
-  if (bfd_get_flavour (ibfd) == bfd_target_elf_flavour
-      && strip_symbols == STRIP_NONDEBUG)
-    /* Do not copy the private data when creating an ELF format
-       debug info file.  We do not want the program headers.  */
-    ;
-  else if (! bfd_copy_private_bfd_data (ibfd, obfd))
+  if (! bfd_copy_private_bfd_data (ibfd, obfd))
     {
       non_fatal (_("%s: error copying private BFD data: %s"),
                 bfd_get_filename (obfd),
@@ -2206,7 +2196,9 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
 
   if (p != NULL && p->set_flags)
     flags = p->flags | (flags & (SEC_HAS_CONTENTS | SEC_RELOC));
-  else if (strip_symbols == STRIP_NONDEBUG && (flags & SEC_ALLOC) != 0)
+  else if (strip_symbols == STRIP_NONDEBUG
+          && obfd->xvec->flavour != bfd_target_elf_flavour
+          && (flags & SEC_ALLOC) != 0)
     flags &= ~(SEC_HAS_CONTENTS | SEC_LOAD);
 
   osection = bfd_make_section_anyway_with_flags (obfd, name, flags);
@@ -2289,12 +2281,7 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
 
   /* Allow the BFD backend to copy any private data it understands
      from the input section to the output section.  */
-  if (bfd_get_flavour (ibfd) == bfd_target_elf_flavour
-      && strip_symbols == STRIP_NONDEBUG)
-    /* Do not copy the private data when creating an ELF format
-       debug info file.  We do not want the program headers.  */
-    ;
-  else if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection))
+  if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection))
     {
       err = _("private data");
       goto loser;
@@ -2769,10 +2756,10 @@ strip_main (int argc, char *argv[])
           It has already been checked in get_file_size().  */
        stat (argv[i], &statbuf);
 
-      if (output_file != NULL)
-       tmpname = output_file;
-      else
+      if (output_file == NULL || strcmp (argv[i], output_file) == 0)
        tmpname = make_tempname (argv[i]);
+      else
+       tmpname = output_file;
 
       if (tmpname == NULL)
        {
@@ -2788,13 +2775,14 @@ strip_main (int argc, char *argv[])
        {
          if (preserve_dates)
            set_times (tmpname, &statbuf);
-         if (output_file == NULL)
-           smart_rename (tmpname, argv[i], preserve_dates);
+         if (output_file != tmpname)
+           smart_rename (tmpname, output_file ? output_file : argv[i],
+                         preserve_dates);
          status = hold_status;
        }
       else
        unlink_if_ordinary (tmpname);
-      if (output_file == NULL)
+      if (output_file != tmpname)
        free (tmpname);
     }
 
@@ -2807,6 +2795,7 @@ copy_main (int argc, char *argv[])
   char * binary_architecture = NULL;
   char *input_filename = NULL;
   char *output_filename = NULL;
+  char *tmpname;    
   char *input_target = NULL;
   char *output_target = NULL;
   bfd_boolean show_version = FALSE;
@@ -3397,32 +3386,24 @@ copy_main (int argc, char *argv[])
   /* If there is no destination file, or the source and destination files
      are the same, then create a temp and rename the result into the input.  */
   if (output_filename == NULL || strcmp (input_filename, output_filename) == 0)
-    {
-      char *tmpname = make_tempname (input_filename);
-
-      if (tmpname == NULL)
-       fatal (_("warning: could not create temporary file whilst copying '%s', (error: %s)"),
-              input_filename, strerror (errno));
-
-      copy_file (input_filename, tmpname, input_target, output_target);
-      if (status == 0)
-       {
-         if (preserve_dates)
-           set_times (tmpname, &statbuf);
-         smart_rename (tmpname, input_filename, preserve_dates);
-       }
-      else
-       unlink (tmpname);
-    }
+    tmpname = make_tempname (input_filename);
   else
-    {
-      copy_file (input_filename, output_filename, input_target, output_target);
+    tmpname = output_filename;
+  
+  if (tmpname == NULL)
+    fatal (_("warning: could not create temporary file whilst copying '%s', (error: %s)"),
+          input_filename, strerror (errno));
 
-      if (status == 0 && preserve_dates)
-       set_times (output_filename, &statbuf);
-      else if (status != 0)
-       unlink_if_ordinary (output_filename);
+  copy_file (input_filename, tmpname, input_target, output_target);
+  if (status == 0)
+    {
+      if (preserve_dates)
+       set_times (tmpname, &statbuf);
+      if (tmpname != output_filename)
+       smart_rename (tmpname, input_filename, preserve_dates);
     }
+  else
+    unlink_if_ordinary (tmpname);
 
   if (change_warn)
     {