Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / cache.c

diff --git a/bfd/cache.c b/bfd/cache.c
index 67d3d177290f1726d7446a9db0bc502383e6a4ed..17bf7ea9d595328376be7fc15deea7eea0f5feab 100644 (file)
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -1,6 +1,6 @@
 /* BFD library -- caching of file descriptors.
 
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 Free Software Foundation, Inc.
 
    Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
@@ -78,18 +78,36 @@ bfd_cache_max_open (void)
   if (max_open_files == 0)
     {
       int max;
+#if defined(__sun) && !defined(__sparcv9) && !defined(__x86_64__)
+      /* PR ld/19260: 32-bit Solaris has very inelegant handling of the 255
+        file descriptor limit.  The problem is that setrlimit(2) can raise
+        RLIMIT_NOFILE to a value that is not supported by libc, resulting
+         in "Too many open files" errors.  This can happen here even though
+        max_open_files is set to rlim.rlim_cur / 8.  For example, if
+        a parent process has set rlim.rlim_cur to 65536, then max_open_files
+        will be computed as 8192.
+
+        This check essentially reverts to the behavior from binutils 2.23.1
+         for 32-bit Solaris only.  (It is hoped that the 32-bit libc
+        limitation will be removed soon).  64-bit Solaris libc does not have
+        this limitation.  */
+      max = 16;
+#else
 #ifdef HAVE_GETRLIMIT
       struct rlimit rlim;
+
       if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
          && rlim.rlim_cur != (rlim_t) RLIM_INFINITY)
        max = rlim.rlim_cur / 8;
       else
-#endif /* HAVE_GETRLIMIT */
+#endif
 #ifdef _SC_OPEN_MAX
        max = sysconf (_SC_OPEN_MAX) / 8;
 #else
-       max = 10;
-#endif /* _SC_OPEN_MAX */
+        max = 10;
+#endif
+#endif /* not 32-bit Solaris */
+
       max_open_files = max < 10 ? 10 : max;
     }
 
@@ -418,10 +436,6 @@ cache_bstat (struct bfd *abfd, struct stat *sb)
   return sts;
 }
 
-#ifdef HAVE_MMAP
-static uintptr_t pagesize_m1;
-#endif
-
 static void *
 cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
             void *addr ATTRIBUTE_UNUSED,
@@ -439,6 +453,7 @@ cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
 #ifdef HAVE_MMAP
   else
     {
+      static uintptr_t pagesize_m1;
       FILE *f;
       file_ptr pg_offset;
       bfd_size_type pg_len;
@@ -447,6 +462,9 @@ cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
       if (f == NULL)
        return ret;
 
+      if (pagesize_m1 == 0)
+        pagesize_m1 = getpagesize () - 1;
+
       /* Handle archive members.  */
       if (abfd->my_archive != NULL)
         offset += abfd->origin;
@@ -496,9 +514,6 @@ bfd_cache_init (bfd *abfd)
       if (! close_one ())
        return FALSE;
     }
-#ifdef HAVE_MMAP
-  pagesize_m1 = getpagesize () - 1;
-#endif
   abfd->iovec = &cache_iovec;
   insert (abfd);
   ++open_files;