diff options
| author | Ian Lance Taylor <ian@airs.com> | 2011-04-12 18:06:16 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2011-04-12 18:06:16 +0000 |
| commit | 88597d3422353743f77a4f4de1f3e790cb9f1645 (patch) | |
| tree | a6b753e0fd883354777437707f2bc12e66b31474 /gold/gold.h | |
| parent | 32a946987b2c683c06d55efc2d4d7e682f164e4e (diff) | |
| download | binutils-88597d3422353743f77a4f4de1f3e790cb9f1645.zip binutils-88597d3422353743f77a4f4de1f3e790cb9f1645.tar.gz binutils-88597d3422353743f77a4f4de1f3e790cb9f1645.tar.bz2 | |
* configure.ac: Check for sys/mman.h and mmap. Check for mremap
with MREMAP_MAYMOVE.
* output.h (class Output_file): Add map_is_allocated_ field.
* output.cc: Only #include <sys/mman.h> if it exists. If mmap is
not available, provide stubs. If mremap is not available, #define
it to gold_mremap.
(MREMAP_MAYMOVE): Define if not defined.
(Output_file::Output_file): Initialize map_is_allocated_.
(Output_file::resize): Check map_is_allocated_.
(Output_file::map_anonymous): If mmap fails, use malloc.
(Output_file::unmap): Don't do anything for an anonymous map.
* fileread.cc: Only #include <sys/mman.h> if it exists. If mmap
is not available, provide stubs.
(File_read::View::~View): Use free rather than delete[].
(File_read::make_view): Use malloc rather than new[]. If mmap
fails, use malloc.
(File_read::find_or_make_view): Use malloc rather than new[].
* gold.h: Remove HAVE_REMAP code.
* mremap.c: #include <errno.h>. Only #include <sys/mman.h> if it
exists. Rename mremap to gold_mremap. If mmap is not available
don't do anything.
* configure, config.in: Rebuild.
Diffstat (limited to 'gold/gold.h')
| -rw-r--r-- | gold/gold.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gold/gold.h b/gold/gold.h index 158f63b..133a64e 100644 --- a/gold/gold.h +++ b/gold/gold.h @@ -1,6 +1,6 @@ // gold.h -- general definitions for gold -*- C++ -*- -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -135,11 +135,6 @@ extern "C" ssize_t pread(int, void*, size_t, off_t); extern "C" int ftruncate(int, off_t); #endif -#ifndef HAVE_MREMAP -#define MREMAP_MAYMOVE 1 -extern "C" void *mremap(void *, size_t, size_t, int, ...); -#endif - #ifndef HAVE_FFSLL extern "C" int ffsll(long long); #endif |