From 5cd84a722e09f301d1e134d075e1cfa421db08d6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 1 Oct 2013 13:44:37 +0000 Subject: [PATCH] * 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. --- binutils/ChangeLog | 7 +++++++ binutils/ar.c | 1 + binutils/arsup.c | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 761d2a3a573..a6815f30766 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2013-10-01 Cory Fields + + * 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 * dwarf.c (SAFE_BYTE_GET): Fix argument check. diff --git a/binutils/ar.c b/binutils/ar.c index 987b46cb0e7..a11ed15c86b 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 9ddc55d64a3..9c6953ef8d9 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); -- 2.30.2