diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-04-11 17:05:04 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-11 19:34:42 -0700 |
| commit | 48d96f80be260f0c8dbece14f886a0f1c1166d82 (patch) | |
| tree | 27fd12e5429c31fd2cede3891b1de32ebd44c714 | |
| parent | e46c4f6cc80e078ef5f7dd0a7dcc01740bea3e65 (diff) | |
| download | gdb-48d96f80be260f0c8dbece14f886a0f1c1166d82.zip gdb-48d96f80be260f0c8dbece14f886a0f1c1166d82.tar.gz gdb-48d96f80be260f0c8dbece14f886a0f1c1166d82.tar.bz2 | |
Revert the last 2 commits on pagesize_m1
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/cache.c | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8935574..207884a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,11 +1,5 @@ 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 with SYMBOL_REFERENCES_LOCAL when checking R_386_GOTOFF against protected data symbol when building shared library. diff --git a/bfd/cache.c b/bfd/cache.c index a0a02e4..94a82da 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -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; |