Revert: Use time_t instead of long for archive timestamps.

Back out for now: this breaks the i386 build and requires some revision.

1 files changed, 3 insertions, 8 deletions

diff --git a/contrib/binutils/bfd/archive.c b/contrib/binutils/bfd/archive.c
index 12bb714..053ad47 100644
--- a/contrib/binutils/bfd/archive.c
+++ b/contrib/binutils/bfd/archive.c
@@ -1390,8 +1390,8 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
   /* ar headers are space padded, not null padded!  */
   memset (hdr, ' ', sizeof (struct ar_hdr));
 
-  _bfd_ar_spacepad (hdr->ar_date, sizeof (hdr->ar_date), "%-12lld",
-                    (long long)status.st_mtime);
+  _bfd_ar_spacepad (hdr->ar_date, sizeof (hdr->ar_date), "%-12ld",
+                    status.st_mtime);
 #ifdef HPUX_LARGE_AR_IDS
   /* HP has a very "special" way to handle UID/GID's with numeric values
      > 99999.  */
@@ -1458,11 +1458,6 @@ bfd_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
   if (aloser == hdr->arelt)	      			\
     return -1;
 
-#define fooll(arelt, stelt, size)			\
-  buf->stelt = strtoll (hdr->arelt, &aloser, size);	\
-  if (aloser == hdr->arelt)	      			\
-    return -1;
-
   /* Some platforms support special notations for large IDs.  */
 #ifdef HPUX_LARGE_AR_IDS
 # define foo2(arelt, stelt, size)					\
@@ -1489,7 +1484,7 @@ bfd_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
 # define foo2(arelt, stelt, size) foo (arelt, stelt, size)
 #endif
 
-  fooll (ar_date, st_mtime, 10);
+  foo (ar_date, st_mtime, 10);
   foo2 (ar_uid, st_uid, 10);
   foo2 (ar_gid, st_gid, 10);
   foo (ar_mode, st_mode, 8);