diff options
author | Nick Clifton <nickc@redhat.com> | 2013-10-01 13:44:37 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2013-10-01 13:44:37 +0000 |
commit | 5cd84a722e09f301d1e134d075e1cfa421db08d6 (patch) | |
tree | d234d6278192fdd9ea9bc077d314e5b267282deb /binutils | |
parent | c573f27374d04d64571b928d3e5e2ec901a6a05c (diff) | |
download | binutils-5cd84a722e09f301d1e134d075e1cfa421db08d6.zip binutils-5cd84a722e09f301d1e134d075e1cfa421db08d6.tar.gz binutils-5cd84a722e09f301d1e134d075e1cfa421db08d6.tar.bz2 |
* arsup.c (ar_save): Respect the deterministic setting when
reading from an mri script.
* ar.c (main): Set the default deterministic mode when reading
from an mri script.
Diffstat (limited to 'binutils')
-rw-r--r-- | binutils/ChangeLog | 7 | ||||
-rw-r--r-- | binutils/ar.c | 1 | ||||
-rw-r--r-- | binutils/arsup.c | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 761d2a3..a6815f3 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2013-10-01 Cory Fields <cory@coryfields.com> + + * arsup.c (ar_save): Respect the deterministic setting when + reading from an mri script. + * ar.c (main): Set the default deterministic mode when reading + from an mri script. + 2013-10-01 Jan-Benedict Glaw <jbglaw@lug-owl.de> * dwarf.c (SAFE_BYTE_GET): Fix argument check. diff --git a/binutils/ar.c b/binutils/ar.c index 987b46c..a11ed15 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -737,6 +737,7 @@ main (int argc, char **argv) if (mri_mode) { + default_deterministic (); mri_emul (); } else diff --git a/binutils/arsup.c b/binutils/arsup.c index 9ddc55d..9c6953e 100644 --- a/binutils/arsup.c +++ b/binutils/arsup.c @@ -1,6 +1,5 @@ /* arsup.c - Archive support for MRI compatibility - Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright 1992-2013 2008 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -39,6 +38,7 @@ static void ar_directory_doer (bfd *, bfd *); static void ar_addlib_doer (bfd *, bfd *); extern int verbose; +extern int deterministic; static bfd *obfd; static char *real_name; @@ -334,6 +334,9 @@ ar_save (void) { char *ofilename = xstrdup (bfd_get_filename (obfd)); + if (deterministic > 0) + obfd->flags |= BFD_DETERMINISTIC_OUTPUT; + bfd_close (obfd); smart_rename (ofilename, real_name, 0); |