Initialize pagesize_m1 in bfd_cache_init

There is no need to check and initialize pagesize_m1 in cache_bmmap.

	* cache.c (cache_bmmap): Move pagesize_m1 ... to
	(pagesize_m1): Here.
	(bfd_cache_init): Initialize pagesize_m1.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 207884a1cd705cb9e21ef1e414e1b47d814e6ed5..89355742703c91eab62eaac2305673f6957318e6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * cache.c (cache_bmmap): Move pagesize_m1 ... to
+       (pagesize_m1): Here.
+       (bfd_cache_init): Initialize pagesize_m1.
+
 2015-04-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf32-i386.c (elf_i386_relocate_section): Replace SYMBOLIC_BIND

diff --git a/bfd/cache.c b/bfd/cache.c
index 94a82daff0004da5fa0533a8a714cbc25904a250..67d3d177290f1726d7446a9db0bc502383e6a4ed 100644 (file)
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -418,6 +418,10 @@ 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,
@@ -435,7 +439,6 @@ 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;
@@ -444,9 +447,6 @@ 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,6 +496,9 @@ 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;