darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert the last 2 commits on pagesize_m1

Browse source
This commit is contained in:
H.J. Lu 2015-04-11 17:05:04 -07:00
parent e46c4f6cc8
commit 48d96f80be
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -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>
* elf32-i386.c (elf_i386_relocate_section): Replace SYMBOLIC_BIND

12
bfd/cache.c
View file

@ -418,10 +418,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 +435,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 +444,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,10 +496,6 @@ bfd_cache_init (bfd *abfd)
if (! close_one ())
return FALSE;
}
#ifdef HAVE_MMAP
if (pagesize_m1 == 0)
pagesize_m1 = getpagesize () - 1;
#endif
abfd->iovec = &cache_iovec;
insert (abfd);
++open_files;