Revert the last 2 commits on pagesize_m1
This commit is contained in:
parent
e46c4f6cc8
commit
48d96f80be
2 changed files with 4 additions and 14 deletions
|
@ -1,9 +1,3 @@
|
||||||
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>
|
2015-04-11 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
* elf32-i386.c (elf_i386_relocate_section): Replace SYMBOLIC_BIND
|
* elf32-i386.c (elf_i386_relocate_section): Replace SYMBOLIC_BIND
|
||||||
|
|
12
bfd/cache.c
12
bfd/cache.c
|
@ -418,10 +418,6 @@ cache_bstat (struct bfd *abfd, struct stat *sb)
|
||||||
return sts;
|
return sts;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_MMAP
|
|
||||||
static uintptr_t pagesize_m1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
|
cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
|
||||||
void *addr ATTRIBUTE_UNUSED,
|
void *addr ATTRIBUTE_UNUSED,
|
||||||
|
@ -439,6 +435,7 @@ cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
|
||||||
#ifdef HAVE_MMAP
|
#ifdef HAVE_MMAP
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
static uintptr_t pagesize_m1;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
file_ptr pg_offset;
|
file_ptr pg_offset;
|
||||||
bfd_size_type pg_len;
|
bfd_size_type pg_len;
|
||||||
|
@ -447,6 +444,9 @@ cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
|
||||||
if (f == NULL)
|
if (f == NULL)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
if (pagesize_m1 == 0)
|
||||||
|
pagesize_m1 = getpagesize () - 1;
|
||||||
|
|
||||||
/* Handle archive members. */
|
/* Handle archive members. */
|
||||||
if (abfd->my_archive != NULL)
|
if (abfd->my_archive != NULL)
|
||||||
offset += abfd->origin;
|
offset += abfd->origin;
|
||||||
|
@ -496,10 +496,6 @@ bfd_cache_init (bfd *abfd)
|
||||||
if (! close_one ())
|
if (! close_one ())
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#ifdef HAVE_MMAP
|
|
||||||
if (pagesize_m1 == 0)
|
|
||||||
pagesize_m1 = getpagesize () - 1;
|
|
||||||
#endif
|
|
||||||
abfd->iovec = &cache_iovec;
|
abfd->iovec = &cache_iovec;
|
||||||
insert (abfd);
|
insert (abfd);
|
||||||
++open_files;
|
++open_files;
|
||||||
|
|
Loading…
Reference in a new issue