diff options
| -rw-r--r-- | gold/ChangeLog | 8 | ||||
| -rw-r--r-- | gold/Makefile.in | 3 | ||||
| -rw-r--r-- | gold/config.in | 3 | ||||
| -rwxr-xr-x | gold/configure | 3 | ||||
| -rw-r--r-- | gold/configure.ac | 2 | ||||
| -rw-r--r-- | gold/gold.h | 5 | ||||
| -rw-r--r-- | gold/mremap.c | 57 |
7 files changed, 78 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 0f4063c..f6f638f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2009-03-27 Ian Lance Taylor <iant@google.com> + + * mremap.c: New file. + * configure.ac: Call AC_REPLACE_FUNCS on mremap. + * gold.h (MREMAP_MAYMOVE): Define if HAVE_MREMAP is not defined. + (mremap): Declare if HAVE_MREMAP is not defined. + * configure, Makefile.in, config.in: Rebuild. + 2009-03-27 Cary Coutant <ccoutant@google.com> * powerpc.cc (Target_powerpc::check_non_pic): Assert that output is diff --git a/gold/Makefile.in b/gold/Makefile.in index 4976af9..8c1d00d 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -50,7 +50,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.in \ $(top_srcdir)/configure $(top_srcdir)/po/Make-in ChangeLog \ - NEWS TODO ftruncate.c pread.c yyscript.c yyscript.h + NEWS TODO ftruncate.c mremap.c pread.c yyscript.c yyscript.h subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ @@ -536,6 +536,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mremap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary.Po@am__quote@ diff --git a/gold/config.in b/gold/config.in index 9e41cfb..93264cf 100644 --- a/gold/config.in +++ b/gold/config.in @@ -46,6 +46,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `mremap' function. */ +#undef HAVE_MREMAP + /* Define if compiler supports #pragma omp threadprivate */ #undef HAVE_OMP_SUPPORT diff --git a/gold/configure b/gold/configure index 2b49c2e..6235904 100755 --- a/gold/configure +++ b/gold/configure @@ -5167,7 +5167,8 @@ done -for ac_func in pread ftruncate + +for ac_func in pread ftruncate mremap do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/gold/configure.ac b/gold/configure.ac index a770f87..335ecb3 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -312,7 +312,7 @@ LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" AC_SUBST(LFS_CFLAGS) AC_CHECK_FUNCS(chsize) -AC_REPLACE_FUNCS(pread ftruncate) +AC_REPLACE_FUNCS(pread ftruncate mremap) # Link in zlib if we can. This allows us to write compressed sections. AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) diff --git a/gold/gold.h b/gold/gold.h index 780561d..dc8da55 100644 --- a/gold/gold.h +++ b/gold/gold.h @@ -125,6 +125,11 @@ 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 + namespace gold { diff --git a/gold/mremap.c b/gold/mremap.c new file mode 100644 index 0000000..caa7bc7 --- /dev/null +++ b/gold/mremap.c @@ -0,0 +1,57 @@ +/* mremap.c -- version of mremap for gold. */ + +/* Copyright 2009 Free Software Foundation, Inc. + Written by Ian Lance Taylor <iant@google.com>. + + This file is part of gold. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + +#include "config.h" +#include "ansidecl.h" + +#include <string.h> +#include <sys/types.h> +#include <sys/mman.h> + +/* This file implements mremap for systems which don't have it. The + gold code requires support for mmap. However, there are systems + which have mmap but not mremap. This is not a general replacement + for mremap; it only supports the features which are required for + gold. In particular, we assume that the MREMAP_MAYMOVE flag is + set. */ + +/* Some BSD systems still use MAP_ANON instead of MAP_ANONYMOUS. */ + +#ifndef MAP_ANONYMOUS +# define MAP_ANONYMOUS MAP_ANON +#endif + +void * +mremap (void *old_address, size_t old_size, size_t new_size, + int flags ATTRIBUTE_UNUSED, ...) +{ + void *ret; + + ret = mmap (0, new_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (ret == MAP_FAILED) + return ret; + memcpy (ret, old_address, + old_size < new_size ? old_size : new_size); + (void) munmap (old_address, old_size); + return ret; +} |