diff options
author | Alan Modra <amodra@bigpond.net.au> | 2011-03-04 01:43:23 +0000 |
---|---|---|
committer | Alan Modra <amodra@bigpond.net.au> | 2011-03-04 01:43:23 +0000 |
commit | db4a6a19934ee7c8d5bb7419abe09b0518f17052 (patch) | |
tree | fbc42365f7153296530adb021f814382ad85213e /bfd/archive.c | |
parent | 04aec78a0be135a3dad811f8fd403d72184801d1 (diff) | |
download | binutils-redhat-db4a6a19934ee7c8d5bb7419abe09b0518f17052.tar.gz |
* archive.c (bsd_write_armap): Don't call stat in deterministic
mode, and don't use st_mtime if stat returns error.
Diffstat (limited to 'bfd/archive.c')
-rw-r--r-- | bfd/archive.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index a6643003c8..86d07e9f4a 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -2301,31 +2301,28 @@ bsd_write_armap (bfd *arch, bfd_byte temp[4]; unsigned int count; struct ar_hdr hdr; - struct stat statbuf; long uid, gid; firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG; - stat (arch->filename, &statbuf); + /* If deterministic, we use 0 as the timestamp in the map. + Some linkers may require that the archive filesystem modification + time is less than (or near to) the archive map timestamp. Those + linkers should not be used with deterministic mode. (GNU ld and + Gold do not have this restriction.) */ + bfd_ardata (arch)->armap_timestamp = 0; + uid = 0; + gid = 0; if ((arch->flags & BFD_DETERMINISTIC_OUTPUT) == 0) { - /* Remember the timestamp, to keep it holy. But fudge it a little. */ - bfd_ardata (arch)->armap_timestamp = (statbuf.st_mtime - + ARMAP_TIME_OFFSET); + struct stat statbuf; + + if (stat (arch->filename, &statbuf) == 0) + bfd_ardata (arch)->armap_timestamp = (statbuf.st_mtime + + ARMAP_TIME_OFFSET); uid = getuid(); gid = getgid(); } - else - { - /* If deterministic, we use 0 as the timestamp in the map. - Some linkers may require that the archive filesystem modification - time is less than (or near to) the archive map timestamp. Those - linkers should not be used with deterministic mode. (GNU ld and - Gold do not have this restriction.) */ - bfd_ardata (arch)->armap_timestamp = 0; - uid = 0; - gid = 0; - } memset (&hdr, ' ', sizeof (struct ar_hdr)); memcpy (hdr.ar_name, RANLIBMAG, strlen (RANLIBMAG)); |