[BACK]Return to binemul.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / external / gpl3 / binutils / dist / binutils

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/external/gpl3/binutils/dist/binutils/binemul.c between version 1.1.1.2 and 1.1.1.2.8.1

version 1.1.1.2, 2011/09/24 22:39:13 version 1.1.1.2.8.1, 2014/08/19 23:52:27
Line 1 
Line 1 
 /* Binutils emulation layer.  /* Binutils emulation layer.
    Copyright 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.     Copyright 2002, 2003, 2005, 2007, 2008, 2010
      Free Software Foundation, Inc.
    Written by Tom Rix, Red Hat Inc.     Written by Tom Rix, Red Hat Inc.
   
    This file is part of GNU Binutils.     This file is part of GNU Binutils.
Line 50  ar_emul_append (bfd **after_bfd, char *f
Line 51  ar_emul_append (bfd **after_bfd, char *f
 }  }
   
 static bfd_boolean  static bfd_boolean
 do_ar_emul_default_append (bfd **after_bfd, bfd *new_bfd,  any_ok (bfd *new_bfd ATTRIBUTE_UNUSED)
                            bfd_boolean verbose, bfd_boolean flatten)  {
   {    return TRUE;
   }
   
   bfd_boolean
   do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
                      bfd_boolean verbose, bfd_boolean flatten,
                      bfd_boolean (*check) (bfd *))
   {
   /* When flattening, add the members of an archive instead of the    /* When flattening, add the members of an archive instead of the
      archive itself.  */       archive itself.  */
   if (flatten && bfd_check_format (new_bfd, bfd_archive))    if (flatten && bfd_check_format (new_bfd, bfd_archive))
Line 64  do_ar_emul_default_append (bfd **after_b
Line 72  do_ar_emul_default_append (bfd **after_b
            elt;             elt;
            elt = bfd_openr_next_archived_file (new_bfd, elt))             elt = bfd_openr_next_archived_file (new_bfd, elt))
         {          {
           if (do_ar_emul_default_append (after_bfd, elt, verbose, TRUE))            if (do_ar_emul_append (after_bfd, elt, verbose, TRUE, check))
             {              {
               added = TRUE;                added = TRUE;
               after_bfd = &((*after_bfd)->archive_next);                after_bfd = &((*after_bfd)->archive_next);
Line 74  do_ar_emul_default_append (bfd **after_b
Line 82  do_ar_emul_default_append (bfd **after_b
       return added;        return added;
     }      }
   
     if (!check (new_bfd))
       return FALSE;
   
   AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);    AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
   
   new_bfd->archive_next = *after_bfd;    new_bfd->archive_next = *after_bfd;
Line 91  ar_emul_default_append (bfd **after_bfd,
Line 102  ar_emul_default_append (bfd **after_bfd,
   
   new_bfd = bfd_openr (file_name, target);    new_bfd = bfd_openr (file_name, target);
   AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);    AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
   return do_ar_emul_default_append (after_bfd, new_bfd, verbose, flatten);    return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, any_ok);
 }  }
   
 bfd_boolean  bfd_boolean
Line 109  bfd_boolean
Line 120  bfd_boolean
 ar_emul_default_replace (bfd **after_bfd, char *file_name,  ar_emul_default_replace (bfd **after_bfd, char *file_name,
                          const char *target, bfd_boolean verbose)                           const char *target, bfd_boolean verbose)
 {  {
   bfd *temp;    bfd *new_bfd;
   
   temp = *after_bfd;    new_bfd = bfd_openr (file_name, target);
   *after_bfd = bfd_openr (file_name, target);    AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
   
   AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);  
   AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);    AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
   
   (*after_bfd)->archive_next = temp;    new_bfd->archive_next = *after_bfd;
     *after_bfd = new_bfd;
   
   return TRUE;    return TRUE;
 }  }
Legend:
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.2.8.1
CVSweb <webmaster@jp.NetBSD.org>